[nexuiz-commits] r6478 - in trunk/data: models/items models/turrets qcsrc/server/tturrets/include qcsrc/server/tturrets/system

[DONOTREPLY at icculus.org]

Author: tzork
Date: 2009-04-13 06:09:41 -0400 (Mon, 13 Apr 2009)
New Revision: 6478

Added:
   trunk/data/models/items/jetpack.blend
   trunk/data/models/turrets/terrainbase.md3
Modified:
   trunk/data/qcsrc/server/tturrets/include/turrets_early.qh
   trunk/data/qcsrc/server/tturrets/system/system_damage.qc
   trunk/data/qcsrc/server/tturrets/system/system_main.qc
Log:
Spawnflags TSL_NO_RESPAWN
No EF_FLAME on turret gibs
Make TSF_TERRAINBASE work
Add forgotten jetpack.blend

Added: trunk/data/models/items/jetpack.blend
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/items/jetpack.blend
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/turrets/terrainbase.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/turrets/terrainbase.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/server/tturrets/include/turrets_early.qh
===================================================================
--- trunk/data/qcsrc/server/tturrets/include/turrets_early.qh	2009-04-13 10:06:06 UTC (rev 6477)
+++ trunk/data/qcsrc/server/tturrets/include/turrets_early.qh	2009-04-13 10:09:41 UTC (rev 6478)
@@ -32,8 +32,9 @@
 #define TSF_NO_AMMO_REGEN 4
 /// Dont break path to chase enemys. will still fire at them if possible.
 #define TSF_NO_PATHBREAK  8
+/// Dont respawn
+#define TSL_NO_RESPAWN    16
 
-
 /// target selection flags
 .float target_select_flags;
 /// target validatoin flags

Modified: trunk/data/qcsrc/server/tturrets/system/system_damage.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_damage.qc	2009-04-13 10:06:06 UTC (rev 6477)
+++ trunk/data/qcsrc/server/tturrets/system/system_damage.qc	2009-04-13 10:09:41 UTC (rev 6478)
@@ -35,7 +35,7 @@
     if (b_burn)
     {
         burn = spawn();
-        burn.effects        = EF_LOWPRECISION|EF_FLAME;
+        burn.effects        = EF_LOWPRECISION;//|EF_FLAME;
         setattachment(burn,gib,"");
         setorigin(burn,(gib.mins + gib.maxs) * 0.5);
         SUB_SetFade(burn,time + (f_lifetime * 0.5) ,2);
@@ -112,7 +112,7 @@
     gib.avelocity          = randomvec() * 32;
     gib.think              = turret_gib_boom;
     gib.nextthink          = boomtime;
-    gib.effects            = EF_FLAME;
+    //gib.effects            = EF_FLAME;
 
 
 }
@@ -180,7 +180,7 @@
     }
 
 // Go boom
-    RadiusDamage (self,self, min(self.ammo,50),min(self.ammo,50) * 0.25,250,world,min(self.ammo,50)*5,DEATH_TURRET,world);
+    //RadiusDamage (self,self, min(self.ammo,50),min(self.ammo,50) * 0.25,250,world,min(self.ammo,50)*5,DEATH_TURRET,world);
 
     if(self.damage_flags & TFL_DMG_DEATH_NORESPAWN)
     {

Modified: trunk/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_main.qc	2009-04-13 10:06:06 UTC (rev 6477)
+++ trunk/data/qcsrc/server/tturrets/system/system_main.qc	2009-04-13 10:09:41 UTC (rev 6478)
@@ -863,12 +863,12 @@
     if (self.spawnflags & TSF_TERRAINBASE)
     {
         entity tb;
-        precache_model("models/turrets/terrainbase.md3");
+        //precache_model("models/turrets/terrainbase.md3");
         tb = spawn();
         setmodel(tb,"models/turrets/terrainbase.md3");
         setorigin(tb,self.origin);
         tb.solid = SOLID_BBOX;
-        makestatic(tb);
+        //makestatic(tb);
     }
 
     self.cvar_basename = cvar_base_name;
@@ -1090,6 +1090,11 @@
     if (!self.ammo_flags)
         self.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE;
 
+// Damage stuff
+    if(self.spawnflags & TSL_NO_RESPAWN)
+        if not (self.damage_flags & TFL_DMG_DEATH_NORESPAWN)
+            self.damage_flags |= TFL_DMG_DEATH_NORESPAWN;
+
 // Offsets & origins
     if (!self.tur_shotorg)   self.tur_shotorg = '50 0 50';