From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 16 Apr 2011 22:49:43 +0000 (+0300)
Subject: Add iqm support to the code, and use it for weapons. Alt fire anim will play melee... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9f20ed0e6980e5c5f27aeb67544d6a4fd5af257;p=voretournament%2Fvoretournament.git

Add iqm support to the code, and use it for weapons. Alt fire anim will play melee attack however, which will be fixed in the next commit
---

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 8e3754b9..b096334c 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -406,6 +406,7 @@ string CheckPlayerModel(string plyermodel) {
 	{
 		if(substring(plyermodel,-4,4) != ".zym")
 		if(substring(plyermodel,-4,4) != ".dpm")
+		if(substring(plyermodel,-4,4) != ".iqm")
 		if(substring(plyermodel,-4,4) != ".md3")
 		if(substring(plyermodel,-4,4) != ".psk")
 			return FallbackPlayerModel;
diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index d8069134..6c086a06 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -382,8 +382,8 @@ void CL_Weaponentity_Think()
 			}
 			else
 			{
-				setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".dpm")); // precision set below
-				animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".dpm.animinfo");
+				setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".iqm")); // precision set below
+				animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".iqm.animinfo");
 				animfile = fopen(animfilename, FILE_READ);
 				// preset some defaults that work great for renamed zym files (which don't need an animinfo)
 				self.anim_fire1  = '0 1 0.01';
@@ -567,7 +567,7 @@ void CL_Weaponentity_Think()
 
 	if(self.owner.alpha == default_player_alpha)
 		self.alpha = default_weapon_alpha;
-	else if(self.owner.alpha != 0)
+	else if(self.owner.alpha != 0 && self.owner.predator.classname != "player")
 		self.alpha = self.owner.alpha;
 	else
 		self.alpha = 1;
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 09e882fb..d6d54ed2 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1353,6 +1353,7 @@ void precache()
         precache_all_models("models/player/*.dpm");
         precache_all_models("models/player/*.md3");
         precache_all_models("models/player/*.psk");
+		precache_all_models("models/player/*.iqm");
         //precache_model("models/player/vixen.zym");
     }
 
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 34b13778..7274dd62 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -191,7 +191,7 @@ float w_grabber(float req)
 	{
 		precache_model ("models/weapons/g_grabber.md3");
 		precache_model ("models/weapons/v_grabber.md3");
-		precache_model ("models/weapons/h_grabber.dpm");
+		precache_model ("models/weapons/h_grabber.iqm");
 		precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc
 		precache_sound ("weapons/grabber_fire.wav");
 		precache_sound ("weapons/grabber_altfire.wav");