[nexuiz-commits] r7532 - in trunk/data: . models/onslaught qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Aug 26 10:02:56 EDT 2009


Author: div0
Date: 2009-08-26 10:02:55 -0400 (Wed, 26 Aug 2009)
New Revision: 7532

Added:
   trunk/data/models/onslaught/shockwavetransring.md3.framegroups
Modified:
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/mode_onslaught.qc
   trunk/data/weapons.cfg
   trunk/data/weaponsHavoc.cfg
Log:
onslaught: change another model effect to be clientside. PLEASE TEST AND POSSIBLY FIX.


Added: trunk/data/models/onslaught/shockwavetransring.md3.framegroups
===================================================================
--- trunk/data/models/onslaught/shockwavetransring.md3.framegroups	                        (rev 0)
+++ trunk/data/models/onslaught/shockwavetransring.md3.framegroups	2009-08-26 14:02:55 UTC (rev 7532)
@@ -0,0 +1 @@
+1 24 20 1

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-08-26 13:33:46 UTC (rev 7531)
+++ trunk/data/qcsrc/server/constants.qh	2009-08-26 14:02:55 UTC (rev 7532)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "f65221846eecbdf910cfb40f5839ac0d";
-string CVAR_CHECK_WEAPONS = "795fd7178fcb71cfccda2f230f231fdd";
+string CVAR_CHECK_DEFAULT = "ff6f4ae047891b3b61ecfc5b3d3b38b4";
+string CVAR_CHECK_WEAPONS = "a7ca57b891d66754b856e24e5c1745e3";
 
 float	FALSE					= 0;
 float	TRUE					= 1;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-08-26 13:33:46 UTC (rev 7531)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-08-26 14:02:55 UTC (rev 7532)
@@ -2547,5 +2547,5 @@
 
 void shockwave_spawn(string m, vector org, float sz, float t1, float t2)
 {
-	modeleffect_spawn(m, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
+	return modeleffect_spawn(m, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
 }

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2009-08-26 13:33:46 UTC (rev 7531)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2009-08-26 14:02:55 UTC (rev 7532)
@@ -400,36 +400,11 @@
 	}
 };
 
-void onslaught_generator_ring_think()
-{
-	self.nextthink = time + 0.05;
-	if(self.count > 24)
-	{
-		self.think = SUB_Remove;
-		return;
-	}
-
-	self.scale = self.count * 4;
-
-	self.frame = self.count;
-
-	self.count += 1;
-	self.alpha = 0.1;
-};
-
 void onslaught_generator_ring_spawn(vector org)
 {
-	entity e;
-	e = spawn();
-	setmodel(e, "models/onslaught/shockwavetransring.md3");
-	setorigin(e, org);
-
-	e.count = 1;
-	e.alpha = 0;
-
-	e.think = onslaught_generator_ring_think;
-	e.nextthink = time + 0.05;
+	modeleffect_spawn("models/onslaught/shockwavetransring.md3", 0, org, '0 0 0', '0 0 0', '0 0 0', 0, -16, 0.1, 1.25, 0.25);
 };
+
 void onslaught_generator_ray_think()
 {
 	self.nextthink = time + 0.05;

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-08-26 13:33:46 UTC (rev 7531)
+++ trunk/data/weapons.cfg	2009-08-26 14:02:55 UTC (rev 7532)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit weaponsHavoc.cfg too.
 
-set cvar_check_weapons 795fd7178fcb71cfccda2f230f231fdd
+set cvar_check_weapons a7ca57b891d66754b856e24e5c1745e3
 
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!

Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg	2009-08-26 13:33:46 UTC (rev 7531)
+++ trunk/data/weaponsHavoc.cfg	2009-08-26 14:02:55 UTC (rev 7532)
@@ -1,4 +1,4 @@
-set cvar_check_weapons 795fd7178fcb71cfccda2f230f231fdd
+set cvar_check_weapons a7ca57b891d66754b856e24e5c1745e3
 
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!



More information about the nexuiz-commits mailing list