r5990 - in branches/nexuiz-2.0: . data data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-26 12:26:41 -0500 (Thu, 26 Feb 2009)
New Revision: 5990

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc
Log:
r5974 | avirox | 2009-02-25 18:10:45 +0100 (Wed, 25 Feb 2009) | 1 line
- func_breakable_look_destroyed: Don't set SOLID_BSP on a non-BSP model
r5975 | avirox | 2009-02-25 18:19:53 +0100 (Wed, 25 Feb 2009) | 1 line
- .mdl_dead would work best with an origin, but it shouldn't require one; I added a small hack to send it to the middle of the brush entity if no origin brush is present.
r5989 | div0 | 2009-02-26 18:25:04 +0100 (Thu, 26 Feb 2009) | 2 lines
remove "cat" completion


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-02-26 17:25:04 UTC (rev 5989)
+++ branches/nexuiz-2.0/.patchsets	2009-02-26 17:26:41 UTC (rev 5990)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5949,5952-5971,5976-5976,5979-5981
+revisions_applied = 1-5949,5952-5976,5979-5981,5989-5989

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-02-26 17:25:04 UTC (rev 5989)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-02-26 17:26:41 UTC (rev 5990)
@@ -1190,7 +1190,6 @@
 set con_completion_ply		*.dem
 set con_completion_tdem		*.dem
 set con_completion_exec		*.cfg
-set con_completion_cat		"*.cfg *.txt *.log"
 set con_completion_chmap	map
 set con_completion_gotomap	map
 set con_completion_vmap		map

Modified: branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc	2009-02-26 17:25:04 UTC (rev 5989)
+++ branches/nexuiz-2.0/data/qcsrc/server/func_breakable.qc	2009-02-26 17:26:41 UTC (rev 5990)
@@ -68,15 +68,14 @@
 void func_breakable_look_destroyed()
 {
 	if(self.mdl_dead == "")
-	{
 		self.model = "";
-		self.solid = SOLID_NOT;
-	}
-	else
-	{
+	else {
 		setmodel(self, self.mdl_dead);
-		self.solid = SOLID_BSP;
+		if (self.origin == '0 0 0')		// probably no origin brush, so don't spawn in the middle of the map..
+			self.origin = (self.absmax+self.absmin)*.5);
 	}
+		
+	self.solid = SOLID_NOT;
 }
 
 void func_breakable_look_restore()