[nexuiz-commits] r7604 - in branches/nexuiz-2.0: . data/qcsrc/client data/qcsrc/menu data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-03 02:31:17 -0400 (Thu, 03 Sep 2009)
New Revision: 7604

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/client/casings.qc
   branches/nexuiz-2.0/data/qcsrc/client/gibs.qc
   branches/nexuiz-2.0/data/qcsrc/client/rubble.qc
   branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_tetris.qc
Log:
r7595 | div0 | 2009-09-02 09:18:14 -0400 (Wed, 02 Sep 2009) | 2 lines
fix bogus "unreachable code" by changing the break/continue stuff in there
r7597 | div0 | 2009-09-02 14:36:29 -0400 (Wed, 02 Sep 2009) | 2 lines
fix setsize warning
r7601 | div0 | 2009-09-03 01:47:37 -0400 (Thu, 03 Sep 2009) | 2 lines
make declaration of getresolution match DP
r7602 | lordhavoc | 2009-09-03 02:23:20 -0400 (Thu, 03 Sep 2009) | 3 lines
fix bugs with removal of least recent rubble, there were uninitialized
variables and other chaotic elements


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-03 06:23:51 UTC (rev 7603)
+++ branches/nexuiz-2.0/.patchsets	2009-09-03 06:31:17 UTC (rev 7604)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7601-7602

Modified: branches/nexuiz-2.0/data/qcsrc/client/casings.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/casings.qc	2009-09-03 06:23:51 UTC (rev 7603)
+++ branches/nexuiz-2.0/data/qcsrc/client/casings.qc	2009-09-03 06:31:17 UTC (rev 7604)
@@ -84,6 +84,8 @@
 	++casecount;
 	if(casecount >= cvar_or("cl_casings_maxcount",100))
         RubbleDrop(caselist,Casing_Delete);
+	if(wasfreed(casing))
+		return;
 
 	casing.state = ReadByte();
 	casing.silent = (casing.state & 0x80);

Modified: branches/nexuiz-2.0/data/qcsrc/client/gibs.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/gibs.qc	2009-09-03 06:23:51 UTC (rev 7603)
+++ branches/nexuiz-2.0/data/qcsrc/client/gibs.qc	2009-09-03 06:31:17 UTC (rev 7604)
@@ -88,6 +88,8 @@
 	++gibcount;
 	if(gibcount >= cvar_or("cl_gibs_maxcount",100))
         RubbleDrop(giblist,Gib_Delete);
+	if(wasfreed(gib))
+		return;
 
 	//gib = spawn();
 

Modified: branches/nexuiz-2.0/data/qcsrc/client/rubble.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/rubble.qc	2009-09-03 06:23:51 UTC (rev 7603)
+++ branches/nexuiz-2.0/data/qcsrc/client/rubble.qc	2009-09-03 06:31:17 UTC (rev 7604)
@@ -2,20 +2,26 @@
 
 void RubbleDrop(entity list, void() deleteproc)
 {
-    float t,tt;
+    float t;
     entity rub,old_rub;
 
     rub = findchainentity(owner,list);
+    old_rub = rub;
+    t = rub.creationtime;
+    rub = rub.chain;
     while(rub)
     {
-        if(rub.creationtime > t)
+        if(t > rub.creationtime)
         {
+            t = rub.creationtime;
             old_rub = rub;
-            tt = t;
         }
         rub = rub.chain;
     }
 
+    if (old_rub == world)
+        return;
+
     rub = self;
     self = old_rub;
     deleteproc();

Modified: branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh	2009-09-03 06:23:51 UTC (rev 7603)
+++ branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh	2009-09-03 06:31:17 UTC (rev 7604)
@@ -226,7 +226,7 @@
 float	isfunction(string function_name) = #607;
 void	callfunction(...) = #605;
 void	writetofile(float fhandle, entity ent) = #606;
-vector	getresolution(float number) = #608;
+vector	getresolution(float number, ...) = #608; // optional argument "isfullscreen"
 string	keynumtostring(float keynum) = #609;
 string	findkeysforcommand(string command) = #610;
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_tetris.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_tetris.qc	2009-09-03 06:23:51 UTC (rev 7603)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_tetris.qc	2009-09-03 06:31:17 UTC (rev 7604)
@@ -789,15 +789,12 @@
 		for(i = 1; i <= nudge; ++i)
 		{
 			if(CheckMetrics(self.piece_type, check_pos_x + i, check_pos_y, check_pos_z))
-			{
 				self.piece_pos = check_pos + '1 0 0' * i;
-				break;
-			}
 			else if(CheckMetrics(self.piece_type, check_pos_x - i, check_pos_y, check_pos_z))
-			{
 				self.piece_pos = check_pos - '1 0 0' * i;
-				break;
-			}
+			else
+				continue;
+			break;
 		}
 	}
 	check_pos = self.piece_pos;