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

Sync "Raise / lower guest initial happiness"

This commit is contained in:
wolfreak99 2017-02-23 09:32:05 -05:00 committed by Michael Steenbeek
parent c0dc1718a4
commit 48ad60308e
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/editor.c
View File

@ -597,7 +597,7 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s
gGuestInitialCash = max(MONEY(0, 00), min(MONEY(1000, 00), *edx));
break;
case EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS:
gGuestInitialHappiness = max(40, min(250, *edx));
break;
case EDIT_SCENARIOOPTIONS_SETGUESTINITIALHUNGER:

20
src/openrct2/windows/editor_scenario_options.c
View File

@ -895,7 +895,15 @@ static void window_editor_scenario_options_guests_mousedown(sint32 widgetIndex,
break;
case WIDX_GUEST_INITIAL_HAPPINESS_INCREASE:
if (gGuestInitialHappiness < 250) {
gGuestInitialHappiness += 4;
game_do_command(
0,
GAME_COMMAND_FLAG_APPLY,
EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS,
gGuestInitialHappiness + 4,
GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
0,
0
);
} else {
window_error_open(STR_CANT_INCREASE_FURTHER, STR_NONE);
}
@ -903,7 +911,15 @@ static void window_editor_scenario_options_guests_mousedown(sint32 widgetIndex,
break;
case WIDX_GUEST_INITIAL_HAPPINESS_DECREASE:
if (gGuestInitialHappiness > 40) {
gGuestInitialHappiness -= 4;
game_do_command(
0,
GAME_COMMAND_FLAG_APPLY,
EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS,
gGuestInitialHappiness - 4,
GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
0,
0
);
} else {
window_error_open(STR_CANT_REDUCE_FURTHER, STR_NONE);
}