Add iqm support to the code, and use it for weapons. Alt fire anim will play melee...

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 8e3754b95bab6ffc5845efbff0ef325966f204ef..b096334c95a8e5a2cf30b1f4ae4a42cca3b52532 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -406,6 +406,7 @@ string CheckPlayerModel(string plyermodel) {
        {\r
                if(substring(plyermodel,-4,4) != ".zym")\r
                if(substring(plyermodel,-4,4) != ".dpm")\r
+               if(substring(plyermodel,-4,4) != ".iqm")\r
                if(substring(plyermodel,-4,4) != ".md3")\r
                if(substring(plyermodel,-4,4) != ".psk")\r
                        return FallbackPlayerModel;\r

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index d8069134209f8ac07a1096580917db10ba1ea4f4..6c086a0652cb9c7d8cf386633472ae8fe6dedfb6 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -382,8 +382,8 @@ void CL_Weaponentity_Think()
                        }\r
                        else\r
                        {\r
-                               setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".dpm")); // precision set below\r
-                               animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".dpm.animinfo");\r
+                               setmodel(self, strcat("models/weapons/h_", self.owner.weaponname, ".iqm")); // precision set below\r
+                               animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".iqm.animinfo");\r
                                animfile = fopen(animfilename, FILE_READ);\r
                                // preset some defaults that work great for renamed zym files (which don't need an animinfo)\r
                                self.anim_fire1  = '0 1 0.01';\r
@@ -567,7 +567,7 @@ void CL_Weaponentity_Think()
 \r
        if(self.owner.alpha == default_player_alpha)\r
                self.alpha = default_weapon_alpha;\r
-       else if(self.owner.alpha != 0)\r
+       else if(self.owner.alpha != 0 && self.owner.predator.classname != "player")\r
                self.alpha = self.owner.alpha;\r
        else\r
                self.alpha = 1;\r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 09e882fb651e8adcc397c5614ea86601a4f37b99..d6d54ed26b8484c98046348d88c75e4b3ccbc292 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1353,6 +1353,7 @@ void precache()
         precache_all_models("models/player/*.dpm");\r
         precache_all_models("models/player/*.md3");\r
         precache_all_models("models/player/*.psk");\r
+               precache_all_models("models/player/*.iqm");\r
         //precache_model("models/player/vixen.zym");\r
     }\r
 \r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 34b13778478d2e716e2e3e0a2918546e9c7d6ed8..7274dd623c7c918c5cbf6e6951eff34bfc8a506a 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -191,7 +191,7 @@ float w_grabber(float req)
        {\r
                precache_model ("models/weapons/g_grabber.md3");\r
                precache_model ("models/weapons/v_grabber.md3");\r
-               precache_model ("models/weapons/h_grabber.dpm");\r
+               precache_model ("models/weapons/h_grabber.iqm");\r
                precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc\r
                precache_sound ("weapons/grabber_fire.wav");\r
                precache_sound ("weapons/grabber_altfire.wav");\r