On second thought, undo all that shit... this system is WAYYY too hacky to

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / weaponsystem.qc

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 548649db322690db9cbef27c842ad1f55e029728..b4c46ca6f01e0df8eb3c578a8d0ad14ea3a13bd1 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -6,7 +6,7 @@
 
 ===========================================================================
 */
-// WEAPONTODO: move to the .qh file
+
 .float weapon_frametime;
 
 float W_WeaponRateFactor()
@@ -87,25 +87,20 @@ float CL_Weaponentity_CustomizeEntityForClient()
 // to free:
 //   call again with ""
 //   remove the ent
-
-//#define WEP_MODEL_FIRSTPERSON model // h_ // wep.WEP_MODEL_FIRSTPERSON
-//#define WEP_MODEL_THIRDPERSON model2 // v_ // wep.WEP_MODEL_THIRDPERSON
-//#define WEP_MODEL_PICKUP model3 // g_ // wep.WEP_MODEL_PICKUP
-//#define WEP_MODEL_SIMPLE mdl
-void CL_WeaponEntity_SetModel(entity wep)
+void CL_WeaponEntity_SetModel(string name)
 {
        float v_shot_idx;
-       if(wep)
+       if (name != "")
        {
                // if there is a child entity, hide it until we're sure we use it
                if (self.weaponentity)
                        self.weaponentity.model = "";
-               setmodel(self, wep.WEP_MODEL_THIRDPERSON); // precision set below
+               setmodel(self, strcat("models/weapons/v_", name, ".md3")); // precision set below
                v_shot_idx = gettagindex(self, "shot"); // used later
                if(!v_shot_idx)
                        v_shot_idx = gettagindex(self, "tag_shot");
 
-               setmodel(self, wep.WEP_MODEL_FIRSTPERSON); // precision set below
+               setmodel(self, strcat("models/weapons/h_", name, ".iqm")); // precision set below
                // preset some defaults that work great for renamed zym files (which don't need an animinfo)
                self.anim_fire1  = animfixfps(self, '0 1 0.01', '0 0 0');
                self.anim_fire2  = animfixfps(self, '1 1 0.01', '0 0 0');
@@ -118,14 +113,14 @@ void CL_WeaponEntity_SetModel(entity wep)
                {
                        if (!self.weaponentity)
                                self.weaponentity = spawn();
-                       setmodel(self.weaponentity, wep.WEP_MODEL_THIRDPERSON); // precision does not matter
+                       setmodel(self.weaponentity, strcat("models/weapons/v_", name, ".md3")); // precision does not matter
                        setattachment(self.weaponentity, self, "weapon");
                }
                else if(gettagindex(self, "tag_weapon"))
                {
                        if (!self.weaponentity)
                                self.weaponentity = spawn();
-                       setmodel(self.weaponentity, wep.WEP_MODEL_THIRDPERSON); // precision does not matter
+                       setmodel(self.weaponentity, strcat("models/weapons/v_", name, ".md3")); // precision does not matter
                        setattachment(self.weaponentity, self, "tag_weapon");
                }
                else
@@ -253,13 +248,14 @@ void CL_WeaponEntity_SetModel(entity wep)
 
 vector CL_Weapon_GetShotOrg(float wpn)
 {
-       entity oldself;
+       entity wi, oldself;
        vector ret;
+       wi = get_weaponinfo(wpn);
        oldself = self;
        self = spawn();
-       CL_WeaponEntity_SetModel(get_weaponinfo(wpn));
+       CL_WeaponEntity_SetModel(wi.mdl);
        ret = self.movedir;
-       CL_WeaponEntity_SetModel(world);
+       CL_WeaponEntity_SetModel("");
        remove(self);
        self = oldself;
        return ret;
@@ -285,14 +281,13 @@ void CL_Weaponentity_Think()
                        self.weaponentity.model = "";
                return;
        }
-       if (self.weaponname != self.owner.weaponname || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag) // WEAPONTODO: get rid of .weaponname, handle model directly
+       if (self.weaponname != self.owner.weaponname || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)
        {
                self.weaponname = self.owner.weaponname;
                self.dmg = self.owner.modelindex;
                self.deadflag = self.owner.deadflag;
 
-               // WEAPONTODO: get weapon entity from here!
-               //CL_WeaponEntity_SetModel(self.owner.weaponname);
+               CL_WeaponEntity_SetModel(self.owner.weaponname);
        }
 
        tb = (self.effects & (EF_TELEPORT_BIT | EF_RESTARTANIM_BIT));