Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct constants for number keys

Browse Source
This commit is contained in:
cim 2013-12-02 21:13:54 +00:00
parent 8bdbb43cc1
commit e041b5e349
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/descriptions.plist
View File

@ -1132,7 +1132,7 @@
"options-save-commander" = " Save Commander ";
"options-load-commander" = " Load Commander ";
"options-begin-new-game" = " Begin New Game ";
"options-return-to-menu" = " End Game and return to menu ";
"options-return-to-menu" = " End Game and Return to Menu ";
"options-game-options" = " Game Options… ";
"options-exit-game" = " Exit Game ";
"options-reset-to-unrestricted-play" = " Reset and enable OXPs ";

8
src/Core/Entities/PlayerEntityControls.m
View File

@ -3492,7 +3492,7 @@ static BOOL autopilot_pause;
int row_zero = 21;
if (!disc_operation_in_progress)
{
if (([gameView isDown:SDLK_2]) || ([gameView isDown:13] && missionTextRow == 2+row_zero))
if (([gameView isDown:gvNumberKey2]) || ([gameView isDown:13] && missionTextRow == 2+row_zero))
{
[[OOMusicController sharedController] stopThemeMusic];
disc_operation_in_progress = YES;
@ -3505,16 +3505,16 @@ static BOOL autopilot_pause;
break;
}
}
if (([gameView isDown:SDLK_1]) || ([gameView isDown:13] && missionTextRow == 1+row_zero))
if (([gameView isDown:gvNumberKey1]) || ([gameView isDown:13] && missionTextRow == 1+row_zero))
{
missionTextRow = 0;
[self setGuiToScenarioScreen];
}
else if (([gameView isDown:SDLK_3]) || ([gameView isDown:13] && missionTextRow == 3+row_zero))
else if (([gameView isDown:gvNumberKey3]) || ([gameView isDown:13] && missionTextRow == 3+row_zero))
{
[self setGuiToIntroFirstGo:NO];
}
else if (([gameView isDown:SDLK_5]) || ([gameView isDown:13] && missionTextRow == 5+row_zero))
else if (([gameView isDown:gvNumberKey5]) || ([gameView isDown:13] && missionTextRow == 5+row_zero))
{
[[UNIVERSE gameController] exitAppWithContext:@"Exit Game selected on start screen"];
}