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

merge fixes for Universe.m

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@177 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Dylan Smith 2005-10-26 21:13:35 +00:00
parent 2ffadff91b
commit 5ddeaf04f3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Universe.m
View File

@ -3838,10 +3838,11 @@ Your fair use and other rights are in no way affected by the above.
[se setBeaconChar:0]; [se setBeaconChar:0];
} }
[entities removeObject:[self recycleOrDiscard:entity]];
// //
if (entity->isWormhole) if (entity->isWormhole)
[activeWormholes removeObject:entity]; [activeWormholes removeObject:entity];
//
[entities removeObject:[self recycleOrDiscard:entity]];
//NSLog(@"--(%@)\n%@", entity, [entities description]); //NSLog(@"--(%@)\n%@", entity, [entities description]);
@ -3924,11 +3925,12 @@ Your fair use and other rights are in no way affected by the above.
} }
[se setBeaconChar:0]; [se setBeaconChar:0];
} }
[entities removeObject: entity];
// //
if (entity->isWormhole) if (entity->isWormhole)
[activeWormholes removeObject:entity]; [activeWormholes removeObject:entity];
// //
[entities removeObject:[self recycleOrDiscard:entity]];
//
return YES; return YES;
} }
} }