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

Merge pull request #1563 from duncanspumpkin/fix_track 

Fix track bugs.
This commit is contained in:
Duncan 2015-07-06 19:02:15 +01:00
parent 0def7c0883 e898e4dfc4
commit 01be8bb70e
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ride/ride.c
View File

@ -4488,7 +4488,7 @@ int ride_get_refund_price(int ride_id)
z,
0);
map_element_iterator_restart_for_tile(&it);
break;
continue;
}
RCT2_GLOBAL(0x00F4413A, money32) += game_do_command(
@ -4527,7 +4527,6 @@ int ride_get_refund_price(int ride_id)
z,
0);
map_element_iterator_restart_for_tile(&it);
break;
}
RCT2_GLOBAL(RCT2_ADDRESS_GAME_PAUSED, uint8) = oldpaused;
return RCT2_GLOBAL(0x00F4413A, int);

2
src/ride/track.c
View File

@ -3562,7 +3562,7 @@ static money32 track_place(int rideIndex, int type, int originX, int originY, in
offsetX = -trackBlock->y;
offsetY = trackBlock->x;
bl = rol8(bl, 3);
bh |= bl;
bh = bl;
bh = ror8(bh, 4);
bl &= 0x88;
bh &= 0x77;

2
src/windows/game_bottom_toolbar.c
View File

@ -544,7 +544,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rc
// Text
stringId = 1926;
// memcpy((char*)language_get_string(1926), &newsItem->colour, 256);
// memcpy((char*)language_get_string(1926) + 1, &newsItem->colour, 256);
memcpy((void*)0x009B5F2C, &newsItem->colour, 256);
x = w->x + (middleOutsetWidget->left + middleOutsetWidget->right) / 2;
y = w->y + middleOutsetWidget->top + 11;