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

Game Over part3.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1541 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2008-04-04 01:10:08 +00:00
parent 0f38445b4e
commit 2f48840d7a
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,6 +499,7 @@ waitingForStickCallback: 1;
- (NSString *) ship_desc;
- (void) setDockedAtMainStation;
- (StationEntity *) dockedStation;
- (HeadUpDisplay *) hud;

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

@ -2012,6 +2012,11 @@ double scoopSoundPlayTime = 0.0;
return ship_desc;
}
- (void) setDockedAtMainStation
{
dockedStation = [UNIVERSE station];
status=STATUS_DOCKED;
}
- (StationEntity *) dockedStation
{

18
src/Core/Universe.m
View File

@ -385,6 +385,7 @@ static NSComparisonResult comparePrice(NSDictionary *dict1, NSDictionary *dict2,
PlayerEntity* player = [[PlayerEntity sharedPlayer] retain];
Quaternion q0 = kIdentityQuaternion;
int i;
BOOL delayedReset=NO;
no_update = YES;
@ -506,9 +507,15 @@ static NSComparisonResult comparePrice(NSDictionary *dict1, NSDictionary *dict2,
if (player == nil)
player = [[PlayerEntity alloc] init];
else
{
[player set_up:NO];
delayedReset=YES;
}
[self addEntity:player];
[[gameView gameController] setPlayerFileToLoad:nil]; // reset Quicksave
[player setUpShipFromDictionary:[self getDictionaryForShip:[player ship_desc]]]; // ship_desc is the standard Cobra at this point
[self setGalaxy_seed: [player galaxy_seed]];
@ -521,14 +528,11 @@ static NSComparisonResult comparePrice(NSDictionary *dict1, NSDictionary *dict2,
[characterPool removeAllObjects];
[self setUpSpace];
[[self station] initialiseLocalMarketWithSeed:system_seed andRandomFactor:[player random_factor]];
[player setDockedAtMainStation];
demo_ship = nil;
[player set_up];
[player setUpShipFromDictionary:[self getDictionaryForShip:[player ship_desc]]]; // ship_desc is the standard Cobra at this point
[player setStatus:STATUS_DOCKED];
[self setViewDirection:VIEW_GUI_DISPLAY];
[player setPosition:kZeroVector];
[player setOrientation:q0];
@ -541,12 +545,10 @@ static NSComparisonResult comparePrice(NSDictionary *dict1, NSDictionary *dict2,
{
[player setGuiToStatusScreen];
}
if (delayedReset) [player doScriptEvent:@"reset"];
[player release];
no_update = NO;
[localPlanetInfoOverrides removeAllObjects];
}