]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove the weapon_setup function, it's stupid
authorSamual Lenks <samual@xonotic.org>
Mon, 1 Jul 2013 02:31:16 +0000 (22:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 1 Jul 2013 02:31:16 +0000 (22:31 -0400)
22 files changed:
qcsrc/common/weapons/w_arc.qc
qcsrc/common/weapons/w_blaster.qc
qcsrc/common/weapons/w_crylink.qc
qcsrc/common/weapons/w_devastator.qc
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_hagar.qc
qcsrc/common/weapons/w_hlac.qc
qcsrc/common/weapons/w_hook.qc
qcsrc/common/weapons/w_machinegun.qc
qcsrc/common/weapons/w_minelayer.qc
qcsrc/common/weapons/w_minstanex.qc
qcsrc/common/weapons/w_mortar.qc
qcsrc/common/weapons/w_nex.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/common/weapons/w_rifle.qc
qcsrc/common/weapons/w_seeker.qc
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/w_tuba.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/weapons/cl_weapons.qc
qcsrc/server/weapons/main.qc

index 09ba8b67f64e5805e2dc7089b9f1869c9d089d6f..a827246ae230647782ae04ee589e2ebd9ab6db82 100644 (file)
@@ -249,11 +249,6 @@ float w_arc(float req)
                        //precache_sound ("weapons/W_Arc_Beam_fire.wav");
                        return TRUE;
                }
-               case WR_SETUP:
-               {
-                       weapon_setup(WEP_ARC);
-                       return TRUE;
-               }
                case WR_CHECKAMMO1:
                {
                        return !WEP_CVAR_PRI(arc, ammo) || (self.ammo_cells > 0);
index b755b762bac8145c265aa314dca8db9b300e3701..7b572101853956dd733b11d6ef7a264e32a2595d 100644 (file)
@@ -514,7 +514,6 @@ float W_Laser(float request)
                
                case WR_SETUP:
                {
-                       weapon_setup(WEP_LASER);
                        self.current_ammo = ammo_none;
                        return TRUE;
                }
index 8a107636c27b0666bd49fd22cf6b61ccd7ea1a86..b292931485a911ff7b2446986dfe4afdc0d3d79b 100644 (file)
@@ -640,7 +640,6 @@ float w_crylink(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_CRYLINK);
                        self.current_ammo = ammo_cells;
                        return TRUE;
                }
index 347652ef4f8bf4aa6f8b1078735d338fb1ab6644..f14b8cd130bc1b8bbb5c024dec76a6777d7bef4a 100644 (file)
@@ -469,7 +469,6 @@ float W_Devastator(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_DEVASTATOR);
                        self.current_ammo = ammo_rockets;
                        self.rl_release = 1;
                        return TRUE;
index 1df1d13e4c287ff7f377237b6c4663a52317f81a..9947da1f5ab3afc42021c027d80d937092a38e7d 100644 (file)
@@ -522,7 +522,6 @@ float w_electro(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_ELECTRO);
                        self.current_ammo = ammo_cells;
                        return TRUE;
                }
index a45f083321101acb1901c95dcc905466a329007d..fc8e88ab5c75f89527ee706f05ae3fc3760621d8 100644 (file)
@@ -401,7 +401,6 @@ float w_fireball(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_FIREBALL);
                        self.current_ammo = ammo_none;
                        return TRUE;
                }
index 779333d87792df7569b638888ed134f5295dbf69..814efeb26e86e50bcd7d38ad827a2e51bf37e81c 100644 (file)
@@ -447,7 +447,6 @@ float w_hagar(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_HAGAR);
                        self.current_ammo = ammo_rockets;
                        self.hagar_loadblock = FALSE;
 
index 9079edd734bb5cfff7b1bb7809e95a74ef335922..ced2505a60f1143469f6bfee202c6c034b2a1e0b 100644 (file)
@@ -212,7 +212,6 @@ float w_hlac(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_HLAC);
                        self.current_ammo = ammo_cells;
                        return TRUE;
                }
index a9f2bad8f4fa4308869820f209e5b242aa5a7ce3..a9b817006d918c9d16328e14d374ec1579170ccb 100644 (file)
@@ -291,7 +291,6 @@ float w_hook(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_HOOK);
                        self.current_ammo = ammo_fuel;
                        self.hook_state &~= HOOK_WAITING_FOR_RELEASE;
                        return TRUE;
index 216f55397860bc9b542718168b5b9f6202d6e20e..afdda53e9ec3cb32c6f7589426edbaf522dc79ae 100644 (file)
@@ -309,7 +309,6 @@ float w_uzi(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_UZI);
                        self.current_ammo = ammo_nails;
                        return TRUE;
                }
index 3469e3f7c562d10a9d56532d6d83cce0223461df..46f75bce0149240c0febf2873ef2a2c5ede7bb87 100644 (file)
@@ -537,7 +537,6 @@ float w_minelayer(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_MINE_LAYER);
                        self.current_ammo = ammo_rockets;
                        return TRUE;
                }
index fd83f4bb9473cb90c78ea9ec96080cd77344e184..37d9b8efe7424b533d159819bf41f5e1b1772c84 100644 (file)
@@ -160,7 +160,6 @@ float w_minstanex(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_MINSTANEX);
                        self.current_ammo = ammo_cells;
                        self.minstanex_lasthit = 0;
                        return TRUE;
index aff2122dc61a01310f4aa5e401f27119cceabfdc..ef6a36be219f7e1a7ba6f22ff2f69d74044d8d5b 100644 (file)
@@ -391,7 +391,6 @@ float w_glauncher(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_GRENADE_LAUNCHER);
                        self.current_ammo = ammo_rockets;
                        return TRUE;
                }
index 1351118985458c6be8f2c8025d0e9a0395535857..684622d9dc7e221800bd772e53846e28fe00bc02 100644 (file)
@@ -246,7 +246,6 @@ float w_nex(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_NEX);
                        self.current_ammo = ammo_cells;
                        return TRUE;
                }
index 9ca3fdda037f25d87d98e53fdd51a6b828990d3d..b1618595ab624f5414ec6f6a65ec6334a8022638 100644 (file)
@@ -377,7 +377,6 @@ float w_porto(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_PORTO);
                        self.current_ammo = ammo_none;
                        return TRUE;
                }
index abcf6c694b20614b05555f9704b3eb831c0dd173..869aadac64790ae9f9c5f60674b47e30fdad26d1 100644 (file)
@@ -210,7 +210,6 @@ float w_rifle(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_RIFLE);
                        self.current_ammo = ammo_nails;
                        return TRUE;
                }
index 1f992c9240492c3319c4d1a5cd6055e9ae07a343..dd68cf34a5e120ac94aabced5bfc0d18c75e1e09 100644 (file)
@@ -610,7 +610,6 @@ float w_seeker(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_SEEKER);
                        self.current_ammo = ammo_rockets;
                        return TRUE;
                }
index af30b4ccdbd308c8ff6fe5ab4736abb408dcf11f..bc47f7bc3b9187534e4a678f1a3e411af83cb27c 100644 (file)
@@ -249,7 +249,6 @@ float w_shotgun(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_SHOTGUN);
                        self.current_ammo = ammo_shells;
                        return TRUE;
                }
index 51a6120fbdb90b86d43aa15c8f9ecdd770978465..a8b4ad118b2f815c4e84222e4569a93530866ec2 100644 (file)
@@ -403,7 +403,6 @@ float w_tuba(float req)
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_TUBA);
                        self.current_ammo = ammo_none;
                        self.tuba_instrument = 0;
                        return TRUE;
index d6dc52fbe895f35add2beb119f80d33a76b45e80..38d68f5c66006500b71f34bc127c69ef5aa4fc84 100644 (file)
@@ -845,7 +845,7 @@ float w_nexball_weapon(float req)
        }
        else if(req == WR_SETUP)
        {
-               weapon_setup(WEP_PORTO);
+               //weapon_setup(WEP_PORTO);
        }
        // No need to check WR_CHECKAMMO* or WR_AIM, it should always return TRUE
        return TRUE;
index 327d490e7db95fb64aa5446b2f33a3fece130054..ee8e9115eea14fc6b2fa7d0154347337d5f39831 100644 (file)
@@ -402,12 +402,17 @@ void W_WeaponFrame()
                {
                        // end switching!
                        self.switchingweapon = self.switchweapon;
-
                        entity newwep = get_weaponinfo(self.switchweapon);
 
-                       //setanim(self, self.anim_draw, FALSE, TRUE, TRUE);
-                       self.weaponentity.state = WS_RAISE;
+                       self.items &~= IT_AMMO;
+                       self.items = self.items | (newwep.items & IT_AMMO);
+
+                       // the two weapon entities will notice this has changed and update their models
+                       self.weapon = self.switchweapon;
+                       self.weaponname = newwep.mdl;
+                       self.bulletcounter = 0; // WEAPONTODO
                        WEP_ACTION(self.switchweapon, WR_SETUP);
+                       self.weaponentity.state = WS_RAISE;
 
                        // set our clip load to the load of the weapon we switched to, if it's reloadable
                        if(newwep.spawnflags & WEP_FLAG_RELOADABLE && cvar(strcat("g_balance_", newwep.netname, "_reload_ammo"))) // prevent accessing undefined cvars
index 83f38f9b3a7cc4fd3e9d90c0f272268e0b51e98a..c6e9e30a90f39c5a85be60f93571281e9dcaeb3a 100644 (file)
@@ -703,21 +703,6 @@ void w_ready()
        weapon_thinkf(WFRAME_IDLE, 1000000, w_ready);
 }
 
-// Setup weapon for client (after this raise frame will be launched)
-void weapon_setup(float windex)
-{
-       entity e;
-       e = get_weaponinfo(windex);
-       self.items &~= IT_AMMO;
-       self.items = self.items | (e.items & IT_AMMO);
-
-       // the two weapon entities will notice this has changed and update their models
-       self.weapon = windex;
-       self.switchingweapon = windex; // to make sure
-       self.weaponname = e.mdl;
-       self.bulletcounter = 0;
-}
-
 // perform weapon to attack (weaponstate and attack_finished check is here)
 void W_SwitchToOtherWeapon(entity pl)
 {