# HG changeset patch # User tron # Date 1154852599 0 # Node ID cd86b1c47f334ae2dce5a036865e6118cc19ad66 # Parent 558d5a64b24b77bd91a4c5fa8199d8ee87774c66 (svn r5787) Rename width, height and unk of struct DrawTileSeqStruct to size_{x,y,z} diff -r 558d5a64b24b -r cd86b1c47f33 newgrf.c --- 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 */ diff -r 558d5a64b24b -r cd86b1c47f33 rail_cmd.c --- 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 ); } } diff -r 558d5a64b24b -r cd86b1c47f33 sprite.h --- 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; diff -r 558d5a64b24b -r cd86b1c47f33 station_cmd.c --- 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); } diff -r 558d5a64b24b -r cd86b1c47f33 unmovable_cmd.c --- 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;