From 9b5d83e3cd7ed93708319d9cb6fce734f464e123 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 26 Aug 2009 14:02:55 +0000
Subject: [PATCH] onslaught: change another model effect to be clientside.
 PLEASE TEST AND POSSIBLY FIX.

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7532 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 .../shockwavetransring.md3.framegroups        |  1 +
 data/qcsrc/server/constants.qh                |  4 +--
 data/qcsrc/server/miscfunctions.qc            |  2 +-
 data/qcsrc/server/mode_onslaught.qc           | 29 ++-----------------
 data/weapons.cfg                              |  2 +-
 data/weaponsHavoc.cfg                         |  2 +-
 6 files changed, 8 insertions(+), 32 deletions(-)
 create mode 100644 data/models/onslaught/shockwavetransring.md3.framegroups

diff --git a/data/models/onslaught/shockwavetransring.md3.framegroups b/data/models/onslaught/shockwavetransring.md3.framegroups
new file mode 100644
index 000000000..1b1685456
--- /dev/null
+++ b/data/models/onslaught/shockwavetransring.md3.framegroups
@@ -0,0 +1 @@
+1 24 20 1
diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh
index 6ea18bd67..b93e796d7 100644
--- a/data/qcsrc/server/constants.qh
+++ b/data/qcsrc/server/constants.qh
@@ -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;
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index c7889c19e..2a56962f9 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -2547,5 +2547,5 @@ void modeleffect_spawn(string m, float f, vector o, vector v, vector ang, vector
 
 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);
 }
diff --git a/data/qcsrc/server/mode_onslaught.qc b/data/qcsrc/server/mode_onslaught.qc
index e6569b8b8..fb88af271 100644
--- a/data/qcsrc/server/mode_onslaught.qc
+++ b/data/qcsrc/server/mode_onslaught.qc
@@ -400,36 +400,11 @@ void onslaught_generator_think()
 	}
 };
 
-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;
diff --git a/data/weapons.cfg b/data/weapons.cfg
index 216adbdd5..95b87ced2 100644
--- a/data/weapons.cfg
+++ b/data/weapons.cfg
@@ -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!
diff --git a/data/weaponsHavoc.cfg b/data/weaponsHavoc.cfg
index f54107260..6dc4cb669 100644
--- a/data/weaponsHavoc.cfg
+++ b/data/weaponsHavoc.cfg
@@ -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!
-- 
2.39.2