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

Corrected ship status for ships entering from witchspace to STATUS_EXITING_WITCHSPACE / STATUS_IN_FLIGHT

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2894 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2009-12-19 17:17:16 +00:00
parent bf5ee3b2ce
commit e596e6ae90
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8361,7 +8361,7 @@ int w_space_seed = 1234567;
flightPitch = 0.0; flightPitch = 0.0;
flightSpeed = maxFlightSpeed * 0.25; flightSpeed = maxFlightSpeed * 0.25;
[UNIVERSE addEntity:self]; // AI and status get initialised here [UNIVERSE addEntity:self]; // AI and status get initialised here
[self setStatus:STATUS_LAUNCHING]; [self setStatus:STATUS_EXITING_WITCHSPACE];
[shipAI message:@"EXITED_WITCHSPACE"]; [shipAI message:@"EXITED_WITCHSPACE"];
// witchspace exit effects here // witchspace exit effects here

4
src/Core/Universe.m
View File

@ -2408,9 +2408,9 @@ GLfloat docked_light_specular[4] = { DOCKED_ILLUM_LEVEL, DOCKED_ILLUM_LEVEL, DOC
[OOCharacter randomCharacterWithRole:role [OOCharacter randomCharacterWithRole:role
andOriginalSystem: systems[Ranrot() & 255]]]]; andOriginalSystem: systems[Ranrot() & 255]]]];
[ship leaveWitchspace]; // calls UNIVERSE addEntity: STATUS_IN_FLIGHT, AI state GLOBAL [ship leaveWitchspace]; // calls UNIVERSE addEntity: STATUS_EXITING_WITCHSPACE, AI state GLOBAL
//[[ship getAI] setState:@"GLOBAL"]; // must happen after adding to the universe! //[[ship getAI] setState:@"GLOBAL"]; // must happen after adding to the universe!
//[ship setStatus:STATUS_IN_FLIGHT]; // or ships may not werk rite d'uh! [ship setStatus:STATUS_IN_FLIGHT]; // or ships may not work right!
[ship release]; [ship release];
} }