From add5b672d47b2b3a2644df48f89ea5ec155424e9 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 1 May 2009 15:11:46 +0000 Subject: [PATCH] Combine two message pairs into single messages. This tidies up speech a bit. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2155 127b21dd-08f5-0310-b4b7-95ae10353056 --- Resources/Config/descriptions.plist | 6 ++---- src/Core/Entities/PlayerEntity.m | 6 ++---- src/Core/Entities/PlayerEntityControls.m | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Resources/Config/descriptions.plist b/Resources/Config/descriptions.plist index fe71a4b6..e4ff3400 100644 --- a/Resources/Config/descriptions.plist +++ b/Resources/Config/descriptions.plist @@ -377,8 +377,7 @@ // *** Misc. messages *** // Messages used when awarding bounties - "bounty-@" = "Bounty: %@"; - "total-@-credits" = "Total: %@"; + "bounty-@-total-@" = "Bounty: %@\nTotal: %@"; "right-on-commander" = "Right On, Commander!"; // Assorted messages used by the onboard computer @@ -396,8 +395,7 @@ "witch-too-far" = ( "Engines incapable of witchspace jump to that target." ); "witch-engine-malfunction" = ( "Witchspace engine malfunction!" ); "witch-galactic-in-f-seconds" = ( "Intergalactic jump in %.0f s." ); - "game-paused" = ( "Game paused." ); - "game-paused-options" = ( "Press F2 for options, P to resume." ); + "game-paused" = ( "Game paused.\nPress F2 for options, P to resume." ); "game-saved" = ( "Game saved." ); "mouse-on" = ( "Mouse control on." ); "mouse-off" = ( "Mouse control off." ); diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m index ac418365..64acb830 100644 --- a/src/Core/Entities/PlayerEntity.m +++ b/src/Core/Entities/PlayerEntity.m @@ -3625,11 +3625,9 @@ static PlayerEntity *sSharedPlayer = nil; if (score > 9) { - NSString *bonusMS1 = [NSString stringWithFormat:DESC(@"bounty-@"), OOCredits(score)]; - NSString *bonusMS2 = [NSString stringWithFormat:DESC(@"total-@-credits"), OOCredits(credits)]; + NSString *bonusMsg = [NSString stringWithFormat:DESC(@"bounty-@-total-@"), OOCredits(score), OOCredits(credits)]; - [UNIVERSE addDelayedMessage:bonusMS1 forCount:6 afterDelay:0.15]; - [UNIVERSE addDelayedMessage:bonusMS2 forCount:6 afterDelay:0.15]; + [UNIVERSE addDelayedMessage:bonusMsg forCount:6 afterDelay:0.15]; } if (killAward) diff --git a/src/Core/Entities/PlayerEntityControls.m b/src/Core/Entities/PlayerEntityControls.m index dae369ce..1b5e98ad 100644 --- a/src/Core/Entities/PlayerEntityControls.m +++ b/src/Core/Entities/PlayerEntityControls.m @@ -1299,7 +1299,6 @@ static NSTimeInterval time_last_frame; saved_script_time = script_time; saved_gui_screen = gui_screen; [UNIVERSE addMessage:DESC(@"game-paused") forCount:1.0]; - [UNIVERSE addMessage:DESC(@"game-paused-options") forCount:1.0]; [[gameView gameController] pause_game]; } }