From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Fri, 14 May 2010 02:01:46 +0000 (-0400)
Subject: Code changes for shotgun.
X-Git-Tag: xonotic-v0.1.0preview~605^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0df54b44a8333e4d62e065994193837a2438e6b0;p=xonotic%2Fxonotic-data.pk3dir.git

Code changes for shotgun.
---

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index f1e9bf70e..e17c346d2 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -440,8 +440,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';
diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 71451aa09..0b499f483 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -129,7 +129,7 @@ float w_shotgun(float req)
 		precache_model ("models/uziflash.md3");
 		precache_model ("models/weapons/g_shotgun.md3");
 		precache_model ("models/weapons/v_shotgun.md3");
-		precache_model ("models/weapons/h_shotgun.dpm");
+		precache_model ("models/weapons/h_shotgun.iqm");
 		precache_sound ("misc/itempickup.wav");
 		precache_sound ("weapons/shotgun_fire.wav");
 	}