r3596 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-04-26 17:15:56 -0400 (Sat, 26 Apr 2008)
New Revision: 3596

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
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).


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-04-24 05:59:41 UTC (rev 3595)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-04-26 21:15:56 UTC (rev 3596)
@@ -480,7 +480,8 @@
 	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 @@
 	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 = "";

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-04-24 05:59:41 UTC (rev 3595)
+++ trunk/data/qcsrc/server/g_world.qc	2008-04-26 21:15:56 UTC (rev 3596)
@@ -2206,7 +2206,7 @@
 	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