From d8f8332fb2f614ff7f105b5b14fdc6487d61c668 Mon Sep 17 00:00:00 2001
From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 26 Sep 2010 02:08:30 +0300
Subject: [PATCH] Proper projectile, and temporary mine model.

---
 models/mine.md3             | Bin 0 -> 11172 bytes
 qcsrc/client/projectile.qc  |   6 ++++++
 qcsrc/common/constants.qh   |  29 +++++++++++++++--------------
 qcsrc/server/w_minelayer.qc |   5 +++--
 4 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 models/mine.md3

diff --git a/models/mine.md3 b/models/mine.md3
new file mode 100644
index 0000000000000000000000000000000000000000..7758e3e0f3e134e34a90504bc862604a393faf88
GIT binary patch
literal 11172
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

literal 0
HcmV?d00001

diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index 9a773379b..f45a52aa1 100644
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -279,6 +279,7 @@ void Ent_Projectile()
 			case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
 			case PROJECTILE_GRENADE: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break;
 			case PROJECTILE_GRENADE_BOUNCING: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break;
+			case PROJECTILE_MINE: setmodel(self, "models/mine.md3");self.traileffect = particleeffectnum(""); break;
 			case PROJECTILE_LASER: setmodel(self, "models/laser.mdl");self.traileffect = particleeffectnum(""); break;
 			case PROJECTILE_HLAC: setmodel(self, "models/hlac_bullet.md3");self.traileffect = particleeffectnum(""); break;
 			case PROJECTILE_PORTO_RED: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break;
@@ -330,6 +331,10 @@ void Ent_Projectile()
 				self.move_bounce_factor = g_balance_grenadelauncher_secondary_bouncefactor;
 				self.move_bounce_stopspeed = g_balance_grenadelauncher_secondary_bouncestop;
 				break;
+			case PROJECTILE_MINE:
+				self.mins = '-6 -6 -6';
+				self.maxs = '6 6 6';
+				break;
 			case PROJECTILE_PORTO_RED:
 				self.colormod = '2 1 1';
 				self.alphamod = 0.5;
@@ -407,6 +412,7 @@ void Projectile_Precache()
 	precache_model("models/ebomb.mdl");
 	precache_model("models/elaser.mdl");
 	precache_model("models/grenademodel.md3");
+	precache_model("models/mine.md3");
 	precache_model("models/hagarmissile.mdl");
 	precache_model("models/hlac_bullet.md3");
 	precache_model("models/laser.mdl");
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 5ebeb5465..f03875bfc 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -454,20 +454,21 @@ float PROJECTILE_CRYLINK = 5;
 float PROJECTILE_ELECTRO_BEAM = 6;
 float PROJECTILE_GRENADE = 7;
 float PROJECTILE_GRENADE_BOUNCING = 8;
-float PROJECTILE_LASER = 9;
-float PROJECTILE_HLAC = 10;
-float PROJECTILE_SEEKER = 11;
-float PROJECTILE_FLAC = 12;
-float PROJECTILE_PORTO_RED = 13;
-float PROJECTILE_PORTO_BLUE = 14;
-float PROJECTILE_HOOKBOMB = 15;
-float PROJECTILE_HAGAR = 16;
-float PROJECTILE_HAGAR_BOUNCING = 17;
-float PROJECTILE_BULLET_GLOWING = 18;
-float PROJECTILE_CRYLINK_BOUNCING = 19;
-float PROJECTILE_FIREBALL = 20;
-float PROJECTILE_FIREMINE = 21;
-float PROJECTILE_BULLET_GLOWING_TRACER = 22;
+float PROJECTILE_MINE = 9;
+float PROJECTILE_LASER = 10;
+float PROJECTILE_HLAC = 11;
+float PROJECTILE_SEEKER = 12;
+float PROJECTILE_FLAC = 13;
+float PROJECTILE_PORTO_RED = 14;
+float PROJECTILE_PORTO_BLUE = 15;
+float PROJECTILE_HOOKBOMB = 16;
+float PROJECTILE_HAGAR = 17;
+float PROJECTILE_HAGAR_BOUNCING = 18;
+float PROJECTILE_BULLET_GLOWING = 19;
+float PROJECTILE_CRYLINK_BOUNCING = 20;
+float PROJECTILE_FIREBALL = 21;
+float PROJECTILE_FIREMINE = 22;
+float PROJECTILE_BULLET_GLOWING_TRACER = 23;
 
 float SPECIES_HUMAN        =  0;
 float SPECIES_ROBOT_SOLID  =  1;
diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 80bbd44cb..6940a57cf 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -118,7 +118,8 @@ void W_Mine_Think (void)
 void W_Mine_Touch (void)
 {
 	PROJECTILE_TOUCH;
-	self.movetype = MOVETYPE_NONE; // locked in place.
+	spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
+	self.movetype = MOVETYPE_NONE; // lock the mine in place
 	// TODO: make sure this doesn't cause the mine to get stuck in the air if it falls over a team mate (doesn't explode) and the team mate leaves
 }
 
@@ -174,7 +175,7 @@ void W_Mine_Attack (void)
 	mine.cnt = time + cvar("g_balance_minelayer_lifetime");
 	mine.flags = FL_PROJECTILE;
 
-	CSQCProjectile(mine, FALSE, PROJECTILE_ROCKET, FALSE);
+	CSQCProjectile(mine, FALSE, PROJECTILE_MINE, FALSE);
 
 	// muzzle flash for 1st person view
 	flash = spawn ();
-- 
2.39.2