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

Unbroke universe (accidentally broke station set-up).

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@879 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2007-04-01 12:41:15 +00:00
parent 81a8ed0f57
commit ce7270caa3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Universe.m
View File

@ -922,7 +922,7 @@ static Universe *sSharedUniverse = nil;
//// possibly systeminfo has an override for the station
stationDesc = [systeminfo stringForKey:@"station" defaultValue:nil];
stationDesc = [systeminfo stringForKey:@"station" defaultValue:stationDesc];
a_station = (StationEntity *)[self newShipWithRole:stationDesc]; // retain count = 1
if (a_station)
@ -2874,7 +2874,7 @@ GLfloat docked_light_specular[] = { (GLfloat) 1.0, (GLfloat) 1.0, (GLfloat) 0.5,
NSString *shipRoles = (NSString *)[shipDict objectForKey:@"roles"];
if (shipRoles)
isStation = ([shipRoles rangeOfString:@"station"].location != NSNotFound)||([shipRoles rangeOfString:@"carrier"].location != NSNotFound);
isStation = isStation || [shipDict boolForKey:@"isCarrier" defaultValue:isStation];
if (!isStation) isStation = [shipDict boolForKey:@"isCarrier" defaultValue:false];
if (isStation)
ship = (StationEntity *)[self allocRecycledOrNewEntity:@"StationEntity"]; // is returned retained