From: terencehill Date: Wed, 31 Jan 2018 18:17:40 +0000 (+0100) Subject: Merge branch 'master' into terencehill/accuracy_shotgun X-Git-Tag: xonotic-v0.8.5~2281^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b945d959784e5b249c66aea4f3326d8ae048f1cd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/accuracy_shotgun # Conflicts: # qcsrc/server/g_damage.qc --- b945d959784e5b249c66aea4f3326d8ae048f1cd diff --cc qcsrc/server/client.qc index da256e8f4,3333c04e4..3688c4ece --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@@ -2708,15 -2765,9 +2765,14 @@@ void PlayerPostThink (entity this } if (IS_PLAYER(this)) { + if(this.death_time == time && IS_DEAD(this)) + { + this.maxs.z = 5; + setsize(this, this.mins, this.maxs); + } DrownPlayer(this); - CheckRules_Player(this); UpdateChatBubble(this); - if (this.impulse) ImpulseCommands(this); + if (CS(this).impulse) ImpulseCommands(this); if (game_stopped) { CSQCMODEL_AUTOUPDATE(this); diff --cc qcsrc/server/g_damage.qc index 6be1c7dea,029660c2b..713cf385d --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@@ -542,8 -533,8 +533,8 @@@ void Freeze (entity targ, float revives STAT(FROZEN, targ) = frozen_type; targ.revive_progress = ((frozen_type == 3) ? 1 : 0); - targ.health = ((frozen_type == 3) ? targ_maxhealth : 1); + SetResourceAmount(targ, RESOURCE_HEALTH, ((frozen_type == 3) ? targ_maxhealth : 1)); - targ.revive_speed = freeze_time; + targ.revive_speed = revivespeed; if(targ.bot_attack) IL_REMOVE(g_bot_targets, targ); targ.bot_attack = false;