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

Merge pull request #1115 from duncanspumpkin/fix_bugs 

Fix #1103 and #483
This commit is contained in:
Ted John 2015-05-20 21:23:54 +01:00
parent 776c85db74 d3587c2fc5
commit e2b53ddca6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game.c
View File

@ -869,6 +869,7 @@ void game_load_or_quit_no_save_prompt()
load_game();
} else if (RCT2_GLOBAL(RCT2_ADDRESS_SAVE_PROMPT_MODE, uint16) == 1) {
game_do_command(0, 1, 0, 1, GAME_COMMAND_LOAD_OR_QUIT, 0, 0);
tool_cancel();
if (RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_5) {
RCT2_CALLPROC_EBPSAFE(0x0040705E);
RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) &= ~INPUT_FLAG_5;

2
src/windows/ride.c
View File

@ -796,7 +796,7 @@ static void* window_ride_music_events[] = {
// 0x0098DE14
static void* window_ride_measurements_events[] = {
window_ride_emptysub,
window_ride_measurements_close,
window_ride_measurements_mouseup,
window_ride_measurements_resize,
window_ride_measurements_mousedown,