From 6d4850b6b9502527f1ba2588e206b3250f4ab4b1 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 26 Apr 2008 21:15:56 +0000 Subject: [PATCH] make func_snow and func_rain also work when no submodel is used, but origin/mins/maxs specified in the entity parameters. Makes it possible to add snow/rain to a map without recompiling (to create a submodel). git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3596 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/g_triggers.qc | 6 ++++-- data/qcsrc/server/g_world.qc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index 1fd79f230..f207ed53c 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -480,7 +480,8 @@ void() func_rain = self.angles = '0 0 0'; self.movetype = MOVETYPE_NONE; self.solid = SOLID_NOT; - setmodel(self, self.model); // no precision needed + if(self.model != "") + setmodel(self, self.model); // no precision needed setorigin(self, self.origin); setsize(self, self.mins, self.maxs); self.model = ""; @@ -534,7 +535,8 @@ void() func_snow = self.angles = '0 0 0'; self.movetype = MOVETYPE_NONE; self.solid = SOLID_NOT; - setmodel(self, self.model); // no precision needed + if(self.model != "") + setmodel(self, self.model); // no precision needed setorigin(self, self.origin); setsize(self, self.mins, self.maxs); self.model = ""; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index ed84e426d..3dda9ea69 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -2206,7 +2206,7 @@ float RedirectionThink() if(!redirection_timeout) { cvar_set("sv_public", "-2"); - redirection_timeout = time + 0.5; // this will only try twice... should be able to keep more clients + redirection_timeout = time + 0.6; // this will only try twice... should be able to keep more clients if(redirection_target == "self") bprint("^3SERVER NOTICE:^7 restarting the server\n"); else -- 2.39.2