dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r5787) Rename width, height and unk of struct DrawTileSeqStruct to size_{x,y,z}

Browse Source
This commit is contained in:
tron
2006-08-06 08:23:19 +00:00
parent e6ffc4c647
commit fb251d18e0
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
newgrf.c
View File

@@ -862,9 +862,9 @@ static bool StationChangeInfo(uint stid, int numinfo, int prop, byte **bufp, int
if ((byte) dtss->delta_x == 0x80) break; if ((byte) dtss->delta_x == 0x80) break;
dtss->delta_y = grf_load_byte(&buf); dtss->delta_y = grf_load_byte(&buf);
dtss->delta_z = grf_load_byte(&buf); dtss->delta_z = grf_load_byte(&buf);
dtss->width = grf_load_byte(&buf); dtss->size_x = grf_load_byte(&buf);
dtss->height = grf_load_byte(&buf); dtss->size_y = grf_load_byte(&buf);
dtss->unk = grf_load_byte(&buf); dtss->size_z = grf_load_byte(&buf);
dtss->image = grf_load_dword(&buf); dtss->image = grf_load_dword(&buf);
/* Remap flags as ours collide */ /* Remap flags as ours collide */

4
rail_cmd.c
View File

@@ -1382,8 +1382,8 @@ default_waypoint:
AddSortableSpriteToDraw( AddSortableSpriteToDraw(
image, image,
ti->x + dtss->delta_x, ti->y + dtss->delta_y, ti->x + dtss->delta_x, ti->y + dtss->delta_y,
dtss->width, dtss->height, dtss->size_x, dtss->size_y,
dtss->unk, ti->z + dtss->delta_z dtss->size_z, ti->z + dtss->delta_z
); );
} }
} }

5
sprite.h
View File

@@ -12,8 +12,9 @@ typedef struct DrawTileSeqStruct {
int8 delta_x; // 0x80 is sequence terminator int8 delta_x; // 0x80 is sequence terminator
int8 delta_y; int8 delta_y;
int8 delta_z; int8 delta_z;
byte width,height; byte size_x;
byte unk; // 'depth', just z-size; TODO: rename byte size_y;
byte size_z;
uint32 image; uint32 image;
} DrawTileSeqStruct; } DrawTileSeqStruct;

7
station_cmd.c
View File

@@ -2119,7 +2119,12 @@ static void DrawTile_Station(TileInfo *ti)
} }
if ((byte)dtss->delta_z != 0x80) { 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 { } else {
AddChildSpriteScreen(image, dtss->delta_x, dtss->delta_y); AddChildSpriteScreen(image, dtss->delta_x, dtss->delta_y);
} }

6
unmovable_cmd.c
View File

@@ -165,8 +165,10 @@ static void DrawTile_Unmovable(TileInfo *ti)
image |= ormod; image |= ormod;
} }
AddSortableSpriteToDraw( AddSortableSpriteToDraw(
image, ti->x + dtss->delta_x, ti->y + dtss->delta_y, image,
dtss->width, dtss->height, dtss->unk, ti->z + dtss->delta_z 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; break;