Merge branch 'Lyberta/Survival' into Lyberta/master

diff --combined qcsrc/common/mutators/mutator/overkill/hmg.qh
index 58ad5001679c57dc79ebefad3076c45f22f17160,b77728fc988ccc7bea722ab08ce412b78f4b15f5..ebd29f833ce1e26df822713100e8b931057751aa
--- 1/qcsrc/common/mutators/mutator/overkill/hmg.qh
--- 2/qcsrc/common/mutators/mutator/overkill/hmg.qh
+++ b/qcsrc/common/mutators/mutator/overkill/hmg.qh
@@@ -18,29 -18,16 +18,29 @@@ CLASS(HeavyMachineGun, Weapon
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
 -              P(class, prefix, ammo, float, NONE) \
 -              P(class, prefix, damage, float, NONE) \
 -              P(class, prefix, force, float, NONE) \
 -              P(class, prefix, refire, float, NONE) \
 +              P(class, prefix, ammo, float, PRI) \
 +              P(class, prefix, damage, float, PRI) \
 +              P(class, prefix, force, float, PRI) \
 +              P(class, prefix, refire, float, PRI) \
 +              P(class, prefix, solidpenetration, float, PRI) \
 +              P(class, prefix, spread_add, float, PRI) \
 +              P(class, prefix, spread_max, float, PRI) \
 +              P(class, prefix, spread_min, float, PRI) \
 +              P(class, prefix, ammo, float, SEC) \
 +              P(class, prefix, animtime, float, SEC) \
 +              P(class, prefix, damage, float, SEC) \
 +              P(class, prefix, delay, float, SEC) \
 +              P(class, prefix, edgedamage, float, SEC) \
 +              P(class, prefix, force, float, SEC) \
 +              P(class, prefix, lifetime, float, SEC) \
 +              P(class, prefix, radius, float, SEC) \
 +              P(class, prefix, refire, float, SEC) \
 +              P(class, prefix, refire_type, float, SEC) \
 +              P(class, prefix, shotangle, float, SEC) \
 +              P(class, prefix, speed, float, SEC) \
 +              P(class, prefix, spread, float, SEC) \
                P(class, prefix, reload_ammo, float, NONE) \
                P(class, prefix, reload_time, float, NONE) \
 -              P(class, prefix, solidpenetration, float, NONE) \
 -              P(class, prefix, spread_add, float, NONE) \
 -              P(class, prefix, spread_max, float, NONE) \
 -              P(class, prefix, spread_min, float, NONE) \
                P(class, prefix, switchdelay_drop, float, NONE) \
                P(class, prefix, switchdelay_raise, float, NONE) \
                P(class, prefix, weaponreplace, string, NONE) \
@@@ -53,3 -40,7 +53,7 @@@
  
  ENDCLASS(HeavyMachineGun)
  REGISTER_WEAPON(HMG, hmg, NEW(HeavyMachineGun));
+ 
+ #ifdef SVQC
+ spawnfunc(weapon_hmg);
+ #endif

diff --combined qcsrc/common/mutators/mutator/overkill/rpc.qh
index c1c032b18a1ea39579cfd12ef014f85dae76c3ef,a107da39b19908c85fa42b601b63ac9084d64562..ccfd9a279faccf8f55be1c23d05d881d2b1f02d7
--- 1/qcsrc/common/mutators/mutator/overkill/rpc.qh
--- 2/qcsrc/common/mutators/mutator/overkill/rpc.qh
+++ b/qcsrc/common/mutators/mutator/overkill/rpc.qh
@@@ -18,34 -18,21 +18,34 @@@ CLASS(RocketPropelledChainsaw, Weapon
  
  #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
 -              P(class, prefix, ammo, float, NONE) \
 -              P(class, prefix, animtime, float, NONE) \
 -              P(class, prefix, damage2, float, NONE) \
 -              P(class, prefix, damageforcescale, float, NONE) \
 -              P(class, prefix, damage, float, NONE) \
 -              P(class, prefix, edgedamage, float, NONE) \
 -              P(class, prefix, force, float, NONE) \
 -              P(class, prefix, health, float, NONE) \
 -              P(class, prefix, lifetime, float, NONE) \
 -              P(class, prefix, radius, float, NONE) \
 -              P(class, prefix, refire, float, NONE) \
 +              P(class, prefix, ammo, float, PRI) \
 +              P(class, prefix, animtime, float, PRI) \
 +              P(class, prefix, damage, float, PRI) \
 +              P(class, prefix, damage2, float, PRI) \
 +              P(class, prefix, damageforcescale, float, PRI) \
 +              P(class, prefix, edgedamage, float, PRI) \
 +              P(class, prefix, force, float, PRI) \
 +              P(class, prefix, health, float, PRI) \
 +              P(class, prefix, lifetime, float, PRI) \
 +              P(class, prefix, radius, float, PRI) \
 +              P(class, prefix, refire, float, PRI) \
 +              P(class, prefix, speedaccel, float, PRI) \
 +              P(class, prefix, speed, float, PRI) \
 +              P(class, prefix, ammo, float, SEC) \
 +              P(class, prefix, animtime, float, SEC) \
 +              P(class, prefix, damage, float, SEC) \
 +              P(class, prefix, delay, float, SEC) \
 +              P(class, prefix, edgedamage, float, SEC) \
 +              P(class, prefix, force, float, SEC) \
 +              P(class, prefix, lifetime, float, SEC) \
 +              P(class, prefix, radius, float, SEC) \
 +              P(class, prefix, refire, float, SEC) \
 +              P(class, prefix, refire_type, float, SEC) \
 +              P(class, prefix, shotangle, float, SEC) \
 +              P(class, prefix, speed, float, SEC) \
 +              P(class, prefix, spread, float, SEC) \
                P(class, prefix, reload_ammo, float, NONE) \
          P(class, prefix, reload_time, float, NONE) \
 -              P(class, prefix, speedaccel, float, NONE) \
 -              P(class, prefix, speed, float, NONE) \
          P(class, prefix, switchdelay_drop, float, NONE) \
          P(class, prefix, switchdelay_raise, float, NONE) \
          P(class, prefix, weaponreplace, string, NONE) \
@@@ -58,3 -45,7 +58,7 @@@
  
  ENDCLASS(RocketPropelledChainsaw)
  REGISTER_WEAPON(RPC, rpc, NEW(RocketPropelledChainsaw));
+ 
+ #ifdef SVQC
+ spawnfunc(weapon_rpc);
+ #endif

diff --combined qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 3cbe54b1fef9cf6927120f605c655e496741f35f,ce015b12c3aca738cc72c549320a3987b5cdc58b..67362f1d92674e2222351633a316d70bfd2d8628
--- 1/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
--- 2/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@@ -9,13 -9,6 +9,6 @@@ bool autocvar_g_overkill_powerups_repla
  
  bool autocvar_g_overkill_itemwaypoints = true;
  
- bool autocvar_g_overkill_filter_healthmega;
- bool autocvar_g_overkill_filter_armormedium;
- bool autocvar_g_overkill_filter_armorbig;
- bool autocvar_g_overkill_filter_armormega;
- 
- .float ok_item;
- 
  .Weapon ok_lastwep[MAX_WEAPONSLOTS];
  
  void ok_Initialize();
@@@ -102,6 -95,53 +95,6 @@@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCur
        return true;
  }
  
 -MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 -{
 -      if(game_stopped)
 -              return;
 -
 -      entity player = M_ARGV(0, entity);
 -
 -      if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player))
 -              return;
 -
 -      if(PHYS_INPUT_BUTTON_ATCK2(player) && time >= player.jump_interval)
 -      if( !forbidWeaponUse(player)
 -              || (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
 -      {
 -              player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player);
 -              makevectors(player.v_angle);
 -
 -              for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 -              {
 -                      .entity weaponentity = weaponentities[slot];
 -
 -                      if(player.(weaponentity).m_weapon == WEP_Null && slot != 0)
 -                              continue;
 -
 -                      Weapon oldwep = player.(weaponentity).m_weapon;
 -                      player.(weaponentity).m_weapon = WEP_BLASTER;
 -                      W_Blaster_Attack(
 -                              player,
 -                              weaponentity,
 -                              WEP_BLASTER.m_id | HITTYPE_SECONDARY,
 -                              WEP_CVAR_SEC(vaporizer, shotangle),
 -                              WEP_CVAR_SEC(vaporizer, damage),
 -                              WEP_CVAR_SEC(vaporizer, edgedamage),
 -                              WEP_CVAR_SEC(vaporizer, radius),
 -                              WEP_CVAR_SEC(vaporizer, force),
 -                              WEP_CVAR_SEC(vaporizer, speed),
 -                              WEP_CVAR_SEC(vaporizer, spread),
 -                              WEP_CVAR_SEC(vaporizer, delay),
 -                              WEP_CVAR_SEC(vaporizer, lifetime)
 -                      );
 -                      player.(weaponentity).m_weapon = oldwep;
 -              }
 -      }
 -
 -      PHYS_INPUT_BUTTON_ATCK2(player) = false;
 -}
 -
  MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect)
  {
        entity player = M_ARGV(0, entity);
@@@ -217,7 -257,7 +210,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); }
@@@ -255,7 -295,7 +248,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";
  }