From: Mario <mario@smbclan.net>
Date: Thu, 6 Oct 2016 12:54:47 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~50
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ecebe32dc00c4236a4050b73a9dcc9afbcddf087;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
---

ecebe32dc00c4236a4050b73a9dcc9afbcddf087
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 7201aaa0d,f86c71b7e..cbc49be16
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@@ -10,11 -10,19 +10,9 @@@ bool autocvar_g_overkill_100a_anyway
  
  .vector ok_deathloc;
  .float ok_spawnsys_timer;
 -.float ok_lastwep;
 +.Weapon ok_lastwep[MAX_WEAPONSLOTS];
  .float ok_item;
  
- .float ok_pauseregen_finished;
 -.float ok_notice_time;
 -.float ammo_charge[Weapons_MAX];
 -.float ok_use_ammocharge = _STAT(OK_AMMO_CHARGE);
 -.float ok_ammo_charge = _STAT(OK_AMMO_CHARGEPOOL);
 -
 -void(entity ent, float wep) ok_DecreaseCharge;
--
  void ok_Initialize();
  
  REGISTER_MUTATOR(ok, cvar("g_overkill") && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill")
@@@ -153,25 -172,22 +118,26 @@@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink
  	if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player))
  		return;
  
 -	if(player.ok_lastwep)
 +	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
  	{
 -		Weapon newwep = Weapons_from(player.ok_lastwep);
 -		if(player.ok_lastwep == WEP_HMG.m_id)
 -			newwep = WEP_MACHINEGUN;
 -		if(player.ok_lastwep == WEP_RPC.m_id)
 -			newwep = WEP_VORTEX;
 -		PS(player).m_switchweapon = newwep;
 -		player.ok_lastwep = 0;
 -	}
 +		.entity weaponentity = weaponentities[slot];
 +		entity thiswep = player.(weaponentity);
  
 -	ok_IncreaseCharge(player, PS(player).m_weapon.m_id);
 +		if(player.ok_lastwep[slot] && player.ok_lastwep[slot] != WEP_Null)
 +		{
 +			Weapon newwep = player.ok_lastwep[slot];
 +			if(player.ok_lastwep[slot] == WEP_HMG)
 +				newwep = WEP_MACHINEGUN;
 +			if(player.ok_lastwep[slot] == WEP_RPC)
 +				newwep = WEP_VORTEX;
 +			thiswep.m_switchweapon = newwep;
 +			player.ok_lastwep[slot] = WEP_Null;
 +		}
 +	}
  
  	if(PHYS_INPUT_BUTTON_ATCK2(player))
- 	if(!forbidWeaponUse(player) || player.weapon_blocked) // allow if weapon is blocked
+ 	if( !forbidWeaponUse(player) || player.weapon_blocked // allow if weapon is blocked
+ 		|| (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
  	if(time >= player.jump_interval)
  	{
  		player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player);
@@@ -211,16 -240,19 +177,14 @@@ MUTATOR_HOOKFUNCTION(ok, PlayerSpawn
  {
  	entity player = M_ARGV(0, entity);
  
 -	if(autocvar_g_overkill_ammo_charge)
 -	{
 -		FOREACH(Weapons, it != WEP_Null, LAMBDA(player.ammo_charge[it.m_id] = autocvar_g_overkill_ammo_charge_limit));
 -
 -		player.ok_use_ammocharge = 1;
 -		player.ok_notice_time = time;
 -	}
 -	else
 -		player.ok_use_ammocharge = 0;
 -
  	// if player changed their weapon while dead, don't switch to their death weapon
  	if(player.impulse)
 -		player.ok_lastwep = 0;
 +	{
 +		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 +		{
 +			player.ok_lastwep[slot] = WEP_Null;
 +		}
 +	}
- 
- 	player.ok_pauseregen_finished = time + 2;
  }
  
  void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); }