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

try to deal with scripts AFTER dealing with contracts

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@612 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Giles Williams 2006-06-24 21:33:09 +00:00
parent 2043e03b41
commit 12724f862c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Core/PlayerEntity.m
View File

@ -3788,12 +3788,16 @@ double scoopSoundPlayTime = 0.0;
[docked_station initialiseLocalMarketWithSeed:system_seed andRandomFactor:market_rnd];
NSString* escapepodReport = [self processEscapePods];
if ([escapepodReport length])
[deliveryReport appendString: escapepodReport];
[self unloadCargoPods];
[self unloadCargoPods]; // fill up the on-ship commodities before...
// check contracts
NSString* passengerReport = [self checkPassengerContracts];
if (passengerReport)
[deliveryReport appendFormat:@"\n\n%@", passengerReport];
[universe setDisplayText:YES];
if (ootunes_on)
@ -3806,7 +3810,8 @@ double scoopSoundPlayTime = 0.0;
}
// time to check the script!
[self checkScript];
if ((!being_fined)&&([deliveryReport length] < 1))
[self checkScript];
// if we've not switched to the mission screen then proceed normally..
if (gui_screen != GUI_SCREEN_MISSION)
@ -3815,18 +3820,12 @@ double scoopSoundPlayTime = 0.0;
if (being_fined)
[self getFined];
// check contracts
NSString* passengerReport = [self checkPassengerContracts];
if (passengerReport)
[deliveryReport appendFormat:@"\n\n%@", passengerReport];
if ([deliveryReport length])
[self setGuiToDeliveryReportScreenWithText:deliveryReport];
else
[self setGuiToStatusScreen];
}
}
- (void) leaveDock:(StationEntity *)station