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

Game over changes: restart now sets system data properly, and the reset event is now called only once after game over.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1534 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2008-04-01 23:41:29 +00:00
parent 93cbddc81f
commit b62473dc29
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Universe.m
View File

@ -2573,6 +2573,9 @@ GLfloat docked_light_specular[4] = { (GLfloat) 1.0, (GLfloat) 1.0, (GLfloat) 0.5
[[gameView gameController] loadPlayerIfRequired];
[player set_up:NO]; //reset the player - don't call js reset, avoid duplicate reset calls.
[player setUpShipFromDictionary:[self getDictionaryForShip:[player ship_desc]]]; // ship_desc is the standard Cobra at this point
[self setGalaxy_seed: [player galaxy_seed]];
system_seed = [self findSystemAtCoords:[player galaxy_coordinates] withGalaxySeed:galaxy_seed];
@ -2580,11 +2583,8 @@ GLfloat docked_light_specular[4] = { (GLfloat) 1.0, (GLfloat) 1.0, (GLfloat) 0.5
[self setUpSpace];
if (![[self station] localMarket])
[[self station] initialiseLocalMarketWithSeed:system_seed andRandomFactor:[player random_factor]];
[player set_up]; //reset the player
[player setUpShipFromDictionary:[self getDictionaryForShip:[player ship_desc]]]; // ship_desc is the standard Cobra at this point
[[self station] initialiseLocalMarketWithSeed:system_seed andRandomFactor:[player random_factor]];
//[self doScriptEvent:@"reset"]
[player setStatus:STATUS_DOCKED];
[player setGuiToStatusScreen];
displayGUI = YES;