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

Can't-stop-bugfixing bugfix. The witchspace/leave aegis & planet vicinity events now fire in the proper order! (Bug #13237)

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1523 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2008-03-30 06:00:08 +00:00
parent 62082e6b1e
commit f7d8cacc11
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1744,6 +1744,7 @@ double scoopSoundPlayTime = 0.0;
status = STATUS_IN_FLIGHT;
[self doScriptEvent:@"shipExitedWitchspace"];
suppressAegisMessages=NO;
}
}
@ -3583,6 +3584,8 @@ double scoopSoundPlayTime = 0.0;
{
status = STATUS_ENTERING_WITCHSPACE;
[self doScriptEvent:@"shipWillEnterWitchspace" withArgument:@"galactic jump"];
[self transitionToAegisNone];
suppressAegisMessages=YES;
if (primaryTarget != NO_TARGET)
primaryTarget = NO_TARGET;
@ -3672,6 +3675,8 @@ double scoopSoundPlayTime = 0.0;
target_system_seed = [w_hole destination];
status = STATUS_ENTERING_WITCHSPACE;
[self doScriptEvent:@"shipWillEnterWitchspace" withArgument:@"wormhole"];
[self transitionToAegisNone];
suppressAegisMessages=YES;
hyperspeed_engaged = NO;
@ -3717,6 +3722,8 @@ double scoopSoundPlayTime = 0.0;
status = STATUS_ENTERING_WITCHSPACE;
[self doScriptEvent:@"shipWillEnterWitchspace" withArgument:@"standard jump"];
[self transitionToAegisNone];
suppressAegisMessages=YES;
hyperspeed_engaged = NO;

1
src/Core/Entities/ShipEntity.h
View File

@ -480,6 +480,7 @@ MA 02110-1301, USA.
- (BOOL) reportAIMessages;
- (void) setReportAIMessages:(BOOL) yn;
- (void) transitionToAegisNone;
- (OOAegisStatus) checkForAegis;
- (BOOL) withinStationAegis;