Re: [Freeciv-Dev] (PR#39388) S2_1 trident missing t.ocean1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39388 Daniel Markstedt wrote: On 6/10/07, William Allen Simpson [EMAIL PROTECTED] wrote: What tileset? Any. Using my improved error logging (most recently r13003 for S2_1), we discovered that this was not accurate. As I mentioned in the previous message, all the S2_1 tilesets have t.ocean1, except for trident. I've wasted far too many cycles trying to figure out what's wrong with amplio (the default). Sure enough, the new verbose output is: 3: Reading registry from /Users/daniel/freeciv-beta-gtk/share/freeciv/trident/units.spec 3: Reading registry from /Users/daniel/freeciv-beta-gtk/share/freeciv/trident/tiles.spec 0: Don't have graphics tags t.ocean1 or for base (blend) terrain Ocean. This is not a problem with any tileset, it's a problem with trident! That's no surprise, as trident doesn't have blending I've checked trident/tiles.spec back to 1.14, and there's never been any t.ocean1, so it appears an old logic error in the code. Looks like improved error logging actually found it! Unfortunately, it's rather obscure code. :-( It's been completely re-written in trunk. :-) If possible, I'll make it more like trunk. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39388) S2_1 trident missing t.ocean1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39388
The ancient bug had been fixed in trunk months ago.
Tested against all 5 tilesets.
Committed S2_1 revision 13006.
Index: client/tilespec.c
===
--- client/tilespec.c (revision 13005)
+++ client/tilespec.c (working copy)
@@ -2638,7 +2638,6 @@
/* Set up each layer of the drawing. */
for (l = 0; l draw-num_layers; l++) {
sprite_vector_init(draw-layer[l].base);
-sprite_vector_reserve(draw-layer[l].base, 1);
switch (draw-layer[l].cell_type) {
case CELL_SINGLE:
@@ -2673,7 +2672,6 @@
lookup_sprite_tag_alt(t, buffer, , TRUE, matched terrain,
pterrain-name_rule);
}
- draw-layer[l].base.p[0] = draw-layer[l].match[0];
break;
};
break;
@@ -2779,10 +2777,6 @@
};
}
}
- my_snprintf(buffer, sizeof(buffer), t.%s1, draw-name);
- draw-layer[l].base.p[0]
-= lookup_sprite_tag_alt(t, buffer, , TRUE, base (blend) terrain,
-pterrain-name_rule);
break;
};
}
@@ -2795,6 +2789,14 @@
};
enum direction4 dir;
+if (draw-layer[0].base.size 1) {
+ my_snprintf(buffer, sizeof(buffer), t.%s1, draw-name);
+ sprite_vector_reserve(draw-layer[0].base, 1);
+ draw-layer[0].base.p[0]
+ = lookup_sprite_tag_alt(t, buffer, , TRUE, base (blend) terrain,
+ pterrain-name_rule);
+}
+
for (dir = 0; dir 4; dir++) {
assert(sprite_vector_size(draw-layer[0].base) 0);
draw-blend[dir] = crop_sprite(draw-layer[0].base.p[0],
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39388) S2_1 trident missing t.ocean1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39388 It's working now. Thanks for the effort! ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
