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

Display correct pause key in paused message. (issue #41)

Browse Source 
Needs fixing in maintenance branch too, but this fix won't work there, because that branch doesn't have c0c4f6d227
This commit is contained in:
cim 2013-07-08 22:20:17 +01:00
parent 659b572a50
commit 8b339d4441
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Config/descriptions.plist
View File

@ -462,8 +462,8 @@
"witch-engine-malfunction" = "Witchspace engine malfunction!"; "witch-engine-malfunction" = "Witchspace engine malfunction!";
"witch-galactic-in-f-seconds" = "Intergalactic jump in %.0f s."; "witch-galactic-in-f-seconds" = "Intergalactic jump in %.0f s.";
"witch-user-galactic-abort" = "Intergalactic jump aborted."; "witch-user-galactic-abort" = "Intergalactic jump aborted.";
"game-paused" = "Game paused.\nPress F2 for options, P to resume."; "game-paused-@" = "Game paused.\nPress F2 for options, '%C' to resume.";
"game-paused-docked" = "Game paused. Press P to resume."; "game-paused-docked-@" = "Game paused. Press '%C' to resume.";
"game-saved" = "Game saved."; "game-saved" = "Game saved.";
"mouse-on" = "Mouse control on."; "mouse-on" = "Mouse control on.";
"mouse-off" = "Mouse control off."; "mouse-off" = "Mouse control off.";

4
src/Core/Universe.m
View File

@ -551,7 +551,7 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
else else
{ {
[self setPauseMessageVisible:YES]; [self setPauseMessageVisible:YES];
[self addMessage:DESC(@"game-paused-docked") forCount:1.0]; [self addMessage:[NSString stringWithFormat:DESC(@"game-paused-docked-@"),[[PLAYER keyConfig] oo_intForKey:@"key_pausebutton"]] forCount:1.0];
} }
} }
else else
@ -563,7 +563,7 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
else else
{ {
[self setPauseMessageVisible:YES]; [self setPauseMessageVisible:YES];
[self addMessage:DESC(@"game-paused") forCount:1.0]; [self addMessage:[NSString stringWithFormat:DESC(@"game-paused-@"),[[PLAYER keyConfig] oo_intForKey:@"key_pausebutton"]] forCount:1.0];
} }
} }