From 95b2d2f6ba1740eb4570776525401d2ee59ecad0 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 4 Jan 2010 06:55:09 +0000 Subject: [PATCH] - Partly reined in the zombie killer code from rev2927, so dying doesn't crash Oolite to the desktop. However, the game doesn't seem to want to restart once the player's dead. More reining in will be needed, will have a look in 10 hours or so, if it hasn't been sorted by then. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2929 127b21dd-08f5-0310-b4b7-95ae10353056 --- src/Core/Universe.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Core/Universe.m b/src/Core/Universe.m index c2ffc5f7..1f957aac 100644 --- a/src/Core/Universe.m +++ b/src/Core/Universe.m @@ -5589,8 +5589,11 @@ OOINLINE BOOL EntityInRange(Vector p1, Entity *e2, float range) Entity *zombie = nil; for (zombieEnum = [zombies objectEnumerator]; (zombie = [zombieEnum nextObject]); ) { - OOLogERR(@"universe.zombie", @"Found dead entity %@ in active entity list, removing. This is an internal error, please report it.", zombie); - [self removeEntity:zombie]; + if (![zombie isPlayer]) // 'Press Space, Commmander' + { + OOLogERR(@"universe.zombie", @"Found dead entity %@ in active entity list, removing. This is an internal error, please report it.", zombie); + [self removeEntity:zombie]; + } } }