From: terencehill Date: Fri, 1 Jan 2016 22:16:25 +0000 (+0100) Subject: Merge branch 'master' into terencehill/lms_itemtimes_fix X-Git-Tag: xonotic-v0.8.2~1284^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F266%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/lms_itemtimes_fix Conflicts: qcsrc/server/mutators/mutator/gamemode_lms.qc --- f41d9f31538bef0259d2b2c74536bb977901f99d diff --cc qcsrc/server/mutators/mutator/gamemode_lms.qc index 442f539fa,9c9e191d2..9d82004e2 --- a/qcsrc/server/mutators/mutator/gamemode_lms.qc +++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc @@@ -160,14 -157,10 +157,9 @@@ MUTATOR_HOOKFUNCTION(lms, reset_map_glo } MUTATOR_HOOKFUNCTION(lms, reset_map_players) -{SELFPARAM(); +{ - entity e; if(restart_mapalreadyrestarted || (time < game_starttime)) - FOR_EACH_PLAYER(e) - { - PlayerScore_Add(e, SP_LMS_LIVES, LMS_NewPlayerLives()); - } - FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(WITH(entity, self, it, PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives())))); -- ++ FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives()))); return false; }