(svn r5787) Rename width, height and unk of struct DrawTileSeqStruct to size_{x,y,z}
--- a/newgrf.c Sun Aug 06 01:51:57 2006 +0000
+++ b/newgrf.c Sun Aug 06 08:23:19 2006 +0000
@@ -862,9 +862,9 @@
if ((byte) dtss->delta_x == 0x80) break;
dtss->delta_y = grf_load_byte(&buf);
dtss->delta_z = grf_load_byte(&buf);
- dtss->width = grf_load_byte(&buf);
- dtss->height = grf_load_byte(&buf);
- dtss->unk = grf_load_byte(&buf);
+ dtss->size_x = grf_load_byte(&buf);
+ dtss->size_y = grf_load_byte(&buf);
+ dtss->size_z = grf_load_byte(&buf);
dtss->image = grf_load_dword(&buf);
/* Remap flags as ours collide */
--- a/rail_cmd.c Sun Aug 06 01:51:57 2006 +0000
+++ b/rail_cmd.c Sun Aug 06 08:23:19 2006 +0000
@@ -1382,8 +1382,8 @@
AddSortableSpriteToDraw(
image,
ti->x + dtss->delta_x, ti->y + dtss->delta_y,
- dtss->width, dtss->height,
- dtss->unk, ti->z + dtss->delta_z
+ dtss->size_x, dtss->size_y,
+ dtss->size_z, ti->z + dtss->delta_z
);
}
}
--- a/sprite.h Sun Aug 06 01:51:57 2006 +0000
+++ b/sprite.h Sun Aug 06 08:23:19 2006 +0000
@@ -12,8 +12,9 @@
int8 delta_x; // 0x80 is sequence terminator
int8 delta_y;
int8 delta_z;
- byte width,height;
- byte unk; // 'depth', just z-size; TODO: rename
+ byte size_x;
+ byte size_y;
+ byte size_z;
uint32 image;
} DrawTileSeqStruct;
--- a/station_cmd.c Sun Aug 06 01:51:57 2006 +0000
+++ b/station_cmd.c Sun Aug 06 08:23:19 2006 +0000
@@ -2119,7 +2119,12 @@
}
if ((byte)dtss->delta_z != 0x80) {
- AddSortableSpriteToDraw(image, ti->x + dtss->delta_x, ti->y + dtss->delta_y, dtss->width, dtss->height, dtss->unk, ti->z + dtss->delta_z);
+ AddSortableSpriteToDraw(
+ image,
+ ti->x + dtss->delta_x, ti->y + dtss->delta_y,
+ dtss->size_x, dtss->size_y,
+ dtss->size_z, ti->z + dtss->delta_z
+ );
} else {
AddChildSpriteScreen(image, dtss->delta_x, dtss->delta_y);
}
--- a/unmovable_cmd.c Sun Aug 06 01:51:57 2006 +0000
+++ b/unmovable_cmd.c Sun Aug 06 08:23:19 2006 +0000
@@ -165,8 +165,10 @@
image |= ormod;
}
AddSortableSpriteToDraw(
- image, ti->x + dtss->delta_x, ti->y + dtss->delta_y,
- dtss->width, dtss->height, dtss->unk, ti->z + dtss->delta_z
+ image,
+ ti->x + dtss->delta_x, ti->y + dtss->delta_y,
+ dtss->size_x, dtss->size_y,
+ dtss->size_z, ti->z + dtss->delta_z
);
}
break;