From cc2bf5e8ece2d38fb412b7461ebdacd3ffdc567c Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 30 Sep 2016 00:32:07 +1000 Subject: [PATCH] Fix some minor issues --- qcsrc/server/client.qc | 2 +- qcsrc/server/player.qc | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 2023cb0e6b..61b0c779ab 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -701,7 +701,7 @@ void PutClientInServer(entity this) this.(weaponentity).m_switchweapon = WEP_Null; this.(weaponentity).weaponname = ""; this.(weaponentity).m_switchingweapon = WEP_Null; - this.cnt = -1; + this.(weaponentity).cnt = -1; } if (!warmup_stage && !this.alivetime) diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 8b44e39cac..25ad24686d 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -565,8 +565,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, Weapon wep = this.(weaponentity).m_weapon; for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { - .entity weaponentity = weaponentities[slot]; - wep.wr_playerdeath(wep, this, weaponentity); + .entity wepent = weaponentities[slot]; + wep.wr_playerdeath(wep, this, wepent); } RemoveGrapplingHooks(this); @@ -591,8 +591,11 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, // clear waypoints WaypointSprite_PlayerDead(this); // throw a weapon - .entity weaponentity = weaponentities[0]; // TODO: unhardcode - SpawnThrownWeapon(this, this.origin + (this.mins + this.maxs) * 0.5, this.(weaponentity).m_switchweapon.m_id, weaponentity); + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity wepent = weaponentities[slot]; + SpawnThrownWeapon(this, this.origin + (this.mins + this.maxs) * 0.5, this.(wepent).m_switchweapon.m_id, wepent); + } // become fully visible this.alpha = default_player_alpha; -- 2.39.2