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

- fix: show docking denied message only when station is in range. (trunk & maintenance)

Browse Source 
- various docking fixes ported to maintenance.
- updated maintenance changelog.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3685 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2010-07-19 09:41:23 +00:00
parent 58be4de57b
commit 85f9c04f5e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5746,7 +5746,7 @@ static NSString *last_outfitting_key=nil;
unsigned i = 0;
NSEnumerator *eqEnum = nil;
OOEquipmentType *eqType = nil;
unsigned available_facings = [shipyardInfo oo_unsignedIntForKey:KEY_WEAPON_FACINGS];
unsigned available_facings = [shipyardInfo oo_unsignedIntForKey:KEY_WEAPON_FACINGS defaultValue:15]; // use defaults explicitly
if (eqKeyForSelectFacing != nil) // Weapons purchase subscreen.

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

@ -973,8 +973,6 @@ static NSTimeInterval time_last_frame;
{
BOOL isUsingDockingAI = [[shipAI name] isEqual: PLAYER_DOCKING_AI_NAME];
if (!isOkayToUseAutopilot) [UNIVERSE addMessage:DESC(@"autopilot-denied") forCount:4.5];
if (isUsingDockingAI)
{
if ([self checkForAegis] != AEGIS_IN_DOCKING_RANGE)
@ -983,6 +981,10 @@ static NSTimeInterval time_last_frame;
[self playAutopilotOutOfRange];
[UNIVERSE addMessage:DESC(@"autopilot-out-of-range") forCount:4.5];
}
else
{
if (!isOkayToUseAutopilot) [UNIVERSE addMessage:DESC(@"autopilot-denied") forCount:4.5];
}
}
if (isOkayToUseAutopilot)