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

- fix: when restarting a game (F2 > Begin New Game) Oolite would not reset the hyperspace system shown on the status screen to Lave.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3475 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2010-06-06 17:21:36 +00:00
parent 8971373510
commit 16da4f9c3c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1261,6 +1261,7 @@ static BOOL replacingMissile = NO;
- (void)completeSetUp
{
dockedStation = [UNIVERSE station];
target_system_seed = [UNIVERSE findSystemAtCoords:cursor_coordinates withGalaxySeed:galaxy_seed];
[self doWorldScriptEvent:@"startUp" withArguments:nil];
#if NEW_FUEL_PRICES && !defined(NDEBUG)
@ -4744,12 +4745,7 @@ static BOOL replacingMissile = NO;
gui_screen = GUI_SCREEN_STATUS;
BOOL guiChanged = (oldScreen != gui_screen);
// the following line is unnecessary, and - with overlapping planets - can cause Oolite to refer to the wrong system.
//system_seed = [UNIVERSE findSystemAtCoords:galaxy_coordinates withGalaxySeed:galaxy_seed];
if (is_nil_seed(target_system_seed))
{
target_system_seed = [UNIVERSE findSystemAtCoords:cursor_coordinates withGalaxySeed:galaxy_seed];
}
// Both system_seed & target_system_seed are != nil at all times when this function is called.
systemName = [UNIVERSE inInterstellarSpace] ? DESC(@"interstellar-space") : [UNIVERSE getSystemName:system_seed];
if ([self isDocked] && dockedStation != [UNIVERSE station])