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

Removed old nameless missile/mine armed messages (not used).

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3411 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-05-26 19:42:12 +00:00
parent 9a0347a4b5
commit d0fc6e191b
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/descriptions.plist
View File

@ -455,8 +455,6 @@
"ident-off" = "Ident system deactivated.";
"missile-locked-onto-@" = "Missile locked onto %@.";
"ident-locked-onto-@" = "Ident system locked onto %@.";
"missile-armed" = "Missile armed.";
"mine-armed" = "Mine armed.";
"@-armed" = "%@ armed.";
"missile-safe" = "Missiles on safety.";
"incoming-missile" = "Incoming missile.";

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

@ -865,14 +865,12 @@ static NSTimeInterval time_last_frame;
{
[self removeTarget:nil];
[missile_entity[activeMissile] removeTarget:nil];
//[UNIVERSE addMessage:DESC(@"missile-armed") forCount:4.5];
[UNIVERSE addMessage:[NSString stringWithFormat:DESC(@"@-armed"), [missile_entity[activeMissile] name]] forCount:2.0];
[self playMissileArmed];
}
}
else if ([missile_entity[activeMissile] isMine])
{
//[UNIVERSE addMessage:DESC(@"mine-armed") forCount:4.5];
[UNIVERSE addMessage:[NSString stringWithFormat:DESC(@"@-armed"), [missile_entity[activeMissile] name]] forCount:2.0];
[self playMineArmed];
}