mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up some residual usage of non-integrated versions of already integrated variables

This commit is contained in:
Michael Steenbeek 2016-08-13 11:52:42 +02:00 committed by Ted John
parent 4117e9a9e5
commit 7f71bece5c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drawing/sprite.c
View File

@ -407,7 +407,7 @@ void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int
//Top
int top_type = (image_id >> 19) & 0x1f;
uint32 top_offset = palette_to_g1_offset[top_type]; //RCT2_ADDRESS(0x97FCBC, uint32)[top_type];
uint32 top_offset = palette_to_g1_offset[top_type];
rct_g1_element top_palette = g1Elements[top_offset];
memcpy(palette_pointer + 0xF3, top_palette.offset + 0xF3, 12);

2
src/interface/viewport.c
View File

@ -1295,7 +1295,7 @@ static void sub_679023(rct_drawpixelinfo *dpi, int imageId, int x, int y)
if (imageId & 0x80000000) {
index &= 0x1F;
}
int g1Index = RCT2_ADDRESS(0x0097FCBC, uint32)[index];
int g1Index = palette_to_g1_offset[index];
unk_9ABDA4 = g1Elements[g1Index].offset;
} else {
RCT2_GLOBAL(0x00EDF81C, uint32) = 0;

2
src/ride/ride.c
View File

@ -2177,7 +2177,7 @@ static void ride_inspection_update(rct_ride *ride)
if (inspectionIntervalMinutes == 0)
return;
if (RCT2_ADDRESS(0x0097C740, uint32)[ride->type] == 0)
if (RideAvailableBreakdowns[ride->type] == 0)
return;
if (inspectionIntervalMinutes > ride->last_inspection)