[nexuiz-commits] r7791 - in trunk/data/qcsrc: client common

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-15 01:32:03 -0400 (Tue, 15 Sep 2009)
New Revision: 7791

Modified:
   trunk/data/qcsrc/client/gibs.qc
   trunk/data/qcsrc/common/constants.qh
Log:
robot gibs: new species "robot_solid", using the weird robot "gibs" by morphed


Modified: trunk/data/qcsrc/client/gibs.qc
===================================================================
--- trunk/data/qcsrc/client/gibs.qc	2009-09-15 05:22:55 UTC (rev 7790)
+++ trunk/data/qcsrc/client/gibs.qc	2009-09-15 05:32:03 UTC (rev 7791)
@@ -13,6 +13,7 @@
 		case SPECIES_ALIEN:       return "alien_";
 		case SPECIES_ROBOT_SHINY: return "robot_";
 		case SPECIES_ROBOT_RUSTY: return "robot_"; // use the same effects, only different gibs
+		case SPECIES_ROBOT_SOLID: return "robot_"; // use the same effects, only different gibs
 		case SPECIES_ANIMAL:      return "animal_";
 		case SPECIES_RESERVED:    return "reserved_";
 		default:         return "";
@@ -25,17 +26,21 @@
 	{
 		case SPECIES_ROBOT_RUSTY:
 		case SPECIES_ROBOT_SHINY:
-			if(mdlname == "models/gibs/bloodyskull.md3")
-				setmodel(gib, "models/gibs/robo.md3");
-			else
-				setmodel(gib, strcat("models/gibs/robo", ftos(floor(random() * 8) + 1), ".md3"));
-			if(specnum == SPECIES_ROBOT_SHINY)
+		case SPECIES_ROBOT_SOLID:
+			if(specnum != SPECIES_ROBOT_SOLID || mdlname == "models/gibs/chunk.mdl")
 			{
-				gib.skin = 1;
-				gib.colormod = '2 2 2';
+				if(mdlname == "models/gibs/bloodyskull.md3")
+					setmodel(gib, "models/gibs/robo.md3");
+				else
+					setmodel(gib, strcat("models/gibs/robo", ftos(floor(random() * 8) + 1), ".md3"));
+				if(specnum == SPECIES_ROBOT_SHINY)
+				{
+					gib.skin = 1;
+					gib.colormod = '2 2 2';
+				}
+				gib.scale = 1;
+				break;
 			}
-			gib.scale = 1;
-			break;
 		default:
 			setmodel(gib, mdlname);
 			gib.skin = specnum;

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2009-09-15 05:22:55 UTC (rev 7790)
+++ trunk/data/qcsrc/common/constants.qh	2009-09-15 05:32:03 UTC (rev 7791)
@@ -409,10 +409,11 @@
 float PROJECTILE_FIREMINE = 21;
 
 float SPECIES_HUMAN        =  0;
-float SPECIES_ANIMAL       =  1;
+float SPECIES_ROBOT_SOLID  =  1;
 float SPECIES_ALIEN        =  2;
-float SPECIES_ROBOT_RUSTY  =  3;
-float SPECIES_ROBOT_SHINY  =  4;
+float SPECIES_ANIMAL       =  3;
+float SPECIES_ROBOT_RUSTY  =  4;
+float SPECIES_ROBOT_SHINY  =  5;
 float SPECIES_RESERVED     = 15;
 
 // Deathtypes (weapon deathtypes are the IT_* constants below)