Mercurial > hg > openttd

changeset 17916:7ef2094e2f4e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22721) -Fix (r22518): Conditionally hiding a sprite caused subsequent items of the spritelayout to use wrong registers.
author frosch <frosch@openttd.org>
date Sat, 06 Aug 2011 10:47:37 +0000
parents 7ca36ea8f93a
children 3eed52b7ef72
files src/newgrf_commons.cpp
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_commons.cpp
+++ b/src/newgrf_commons.cpp
@@ -647,26 +647,26 @@
 				/* Apply registers */
 				if ((flags & TLF_DODRAW) && GetRegister(regs->dodraw) == 0) {
 					result->image.sprite = 0;
-					continue;
-				}
-				if (HasBit(result->image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE)) result->image.sprite += resolved_sprite;
-				if (flags & TLF_SPRITE) result->image.sprite += (int16)GetRegister(regs->sprite); // mask to 16 bits to avoid trouble
+				} else {
+					if (HasBit(result->image.sprite, SPRITE_MODIFIER_CUSTOM_SPRITE)) result->image.sprite += resolved_sprite;
+					if (flags & TLF_SPRITE) result->image.sprite += (int16)GetRegister(regs->sprite); // mask to 16 bits to avoid trouble
 
-				if (result->IsParentSprite()) {
-					if (flags & TLF_BB_XY_OFFSET) {
-						result->delta_x += (int32)GetRegister(regs->delta.parent[0]);
-						result->delta_y += (int32)GetRegister(regs->delta.parent[1]);
+					if (result->IsParentSprite()) {
+						if (flags & TLF_BB_XY_OFFSET) {
+							result->delta_x += (int32)GetRegister(regs->delta.parent[0]);
+							result->delta_y += (int32)GetRegister(regs->delta.parent[1]);
+						}
+						if (flags & TLF_BB_Z_OFFSET)    result->delta_z += (int32)GetRegister(regs->delta.parent[2]);
+					} else {
+						if (flags & TLF_CHILD_X_OFFSET) result->delta_x += (int32)GetRegister(regs->delta.child[0]);
+						if (flags & TLF_CHILD_Y_OFFSET) result->delta_y += (int32)GetRegister(regs->delta.child[1]);
 					}
-					if (flags & TLF_BB_Z_OFFSET)    result->delta_z += (int32)GetRegister(regs->delta.parent[2]);
-				} else {
-					if (flags & TLF_CHILD_X_OFFSET) result->delta_x += (int32)GetRegister(regs->delta.child[0]);
-					if (flags & TLF_CHILD_Y_OFFSET) result->delta_y += (int32)GetRegister(regs->delta.child[1]);
 				}
 			}
 		}
 
 		/* Is the palette affected by an action-1-2-3 chain? */
-		if (HasBit(result->image.pal, SPRITE_MODIFIER_CUSTOM_SPRITE) || (flags & TLF_PALETTE_REG_FLAGS)) {
+		if (result->image.sprite != 0 && (HasBit(result->image.pal, SPRITE_MODIFIER_CUSTOM_SPRITE) || (flags & TLF_PALETTE_REG_FLAGS))) {
 			/* Does the var10 value apply to this sprite? */
 			uint8 var10 = (flags & TLF_PALETTE_VAR10) ? regs->palette_var10 : (ground && separate_ground ? 1 : 0);
 			if (var10 == resolved_var10) {