]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use standalone weapons in overkill mutator.
authorLyberta <lyberta@lyberta.net>
Sat, 11 Mar 2017 13:44:06 +0000 (16:44 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 11 Mar 2017 13:44:06 +0000 (16:44 +0300)
qcsrc/common/mutators/mutator/overkill/cl_overkill.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

index eb21953955429543f0edd1cb87ec88dd6ade0a03..4f4011b05b231192381e6ba5b50da98d0a06ae68 100644 (file)
@@ -4,8 +4,8 @@ REGISTER_MUTATOR(ok, false)
 {
        MUTATOR_ONADD {
                cvar_settemp("g_overkill", "1");
-               WEP_SHOTGUN.mdl = "ok_shotgun";
-               WEP_MACHINEGUN.mdl = "ok_mg";
-               WEP_VORTEX.mdl = "ok_sniper";
+               //WEP_SHOTGUN.mdl = "ok_shotgun";
+               //WEP_MACHINEGUN.mdl = "ok_mg";
+               //WEP_VORTEX.mdl = "ok_sniper";
        }
 }
index 5d938f3fd03883d6ee66f55c5c63631bfd233cf3..b36bae733476dea98ceffa773c9a9980283858a7 100644 (file)
@@ -243,7 +243,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 
 MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
 {
-       WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));
+       WepSet ok_start_items = (WEPSET(OVERKILL_MACHINEGUN) | WEPSET(OVERKILL_VORTEX) | WEPSET(OVERKILL_SHOTGUN));
 
        if(WEP_RPC.weaponstart > 0) { ok_start_items |= WEPSET(RPC); }
        if(WEP_HMG.weaponstart > 0) { ok_start_items |= WEPSET(HMG); }
@@ -292,7 +292,7 @@ void ok_Initialize()
        WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
        WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 
-       WEP_SHOTGUN.mdl = "ok_shotgun";
-       WEP_MACHINEGUN.mdl = "ok_mg";
-       WEP_VORTEX.mdl = "ok_sniper";
+       //WEP_SHOTGUN.mdl = "ok_shotgun";
+       //WEP_MACHINEGUN.mdl = "ok_mg";
+       //WEP_VORTEX.mdl = "ok_sniper";
 }