Fixed a bug where planetinfo overrides would be loaded from a dictionary named local_planetinfo_overrides, but would be subsequently saved under localPlanetInfoOverrides, thus becoming unusable at next load. Also fixed usage of escape pod not clearing the player's legal status.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1152 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
parent
803aa63c67
commit
1afa377d76
@ -372,7 +372,7 @@ static PlayerEntity *sSharedPlayer = nil;
|
|||||||
// persistant UNIVERSE information
|
// persistant UNIVERSE information
|
||||||
if ([UNIVERSE localPlanetInfoOverrides])
|
if ([UNIVERSE localPlanetInfoOverrides])
|
||||||
{
|
{
|
||||||
[result setObject:[UNIVERSE localPlanetInfoOverrides] forKey:@"localPlanetInfoOverrides"];
|
[result setObject:[UNIVERSE localPlanetInfoOverrides] forKey:@"local_planetinfo_overrides"];
|
||||||
}
|
}
|
||||||
|
|
||||||
// trumble information
|
// trumble information
|
||||||
@ -3275,6 +3275,7 @@ double scoopSoundPlayTime = 0.0;
|
|||||||
//has_escape_pod = NO;
|
//has_escape_pod = NO;
|
||||||
|
|
||||||
// reset legal status
|
// reset legal status
|
||||||
|
legalStatus = 0;
|
||||||
bounty = 0;
|
bounty = 0;
|
||||||
|
|
||||||
// reset trumbles
|
// reset trumbles
|
||||||
|
Loading…
x
Reference in New Issue
Block a user