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

Named missile-armed messages, as per http://aegidian.org/bb/viewtopic.php?t=6895

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2670 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Michael Werle 2009-10-12 21:22:01 +00:00
parent c0ca2c8d27
commit 8abfd996a4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Config/descriptions.plist
View File

@ -448,6 +448,7 @@
"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." );
"energy-low" = ( "Energy low." );

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

@ -743,13 +743,15 @@ static NSTimeInterval time_last_frame;
{
[self removeTarget:nil];
[missile_entity[activeMissile] removeTarget:nil];
[UNIVERSE addMessage:DESC(@"missile-armed") forCount:2.0];
//[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:DESC(@"mine-armed") forCount:4.5];
[UNIVERSE addMessage:[NSString stringWithFormat:DESC(@"@-armed"), [missile_entity[activeMissile] name]] forCount:2.0];
[self playMineArmed];
}
ident_engaged = NO;