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

Combine two message pairs into single messages. This tidies up speech a bit.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2155 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Darren Salt 2009-05-01 15:11:46 +00:00
parent a58978e0ae
commit add5b672d4
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Resources/Config/descriptions.plist
View File

@ -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." );

6
src/Core/Entities/PlayerEntity.m
View File

@ -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)

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

@ -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];
}
}