From 6aed52a49a83ac3336e45eca9a57cd72956d2a68 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 9 Jan 2012 21:08:18 +0100 Subject: [PATCH] func_plat: do not crash if broken --- qcsrc/server/t_plats.qc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index a556d6d0b..087a048c3 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -57,7 +57,17 @@ void plat_spawn_inside_trigger() tmax_y = tmin_y + 1; } - setsize (trigger, tmin, tmax); + if(tmin_x > tmax_x) + if(tmin_y > tmax_y) + if(tmin_z > tmax_z) + { + setsize (trigger, tmin, tmax); + return; + } + + // otherwise, something is fishy... + remove(trigger); + objerror("plat_spawn_inside_trigger: platform has odd size or lip, can't spawn"); } void plat_hit_top() @@ -235,10 +245,10 @@ void spawnfunc_func_plat() self.pos2 = self.origin; self.pos2_z = self.origin_z - self.height; - plat_spawn_inside_trigger (); // the "start moving" trigger - self.reset = plat_reset; plat_reset(); + + plat_spawn_inside_trigger (); // the "start moving" trigger } -- 2.39.2