From 1b68b4e3f5767270d6b76421c474f063fca01bf9 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 3 Nov 2015 21:01:37 -0600 Subject: [PATCH] Revert "theoretically this should prevent calls to getCellId when we're wanting to" This reverts commit f9f25505f034c8b829223bc1df83e60326029273. --- .../script/theme_park/dungeon/generic_spawner.script | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script index 5ef3a334d..4c2daad31 100644 --- a/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script +++ b/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script @@ -284,14 +284,9 @@ void spawnCreatures(int x, string datatable, obj_id self ) string planet = myself.area; string spawnRoom = dataTableGetString (datatable, x, "room"); - - if (spawnRoom != "world") { - obj_id room = getCellId (self, spawnRoom); - } else { - obj_id room = obj_id.NULL_ID; - } + obj_id room = getCellId (self, spawnRoom); - if ((spawnRoom != "world") && !isIdValid (room)) + if (!isIdValid (room) && (spawnRoom != "world")) { CustomerServiceLog("bad_spawner_data", "spawner " + self + ", datatable " + datatable + ", row " + x + ", mob " + spawn + ", room " + spawnRoom + " doesn't exist"); removeObjVar (self, SPAWNED + x);