Merge branch 'master' into terencehill/lms_itemtimes_fix 266/head
authorterencehill <piuntn@gmail.com>
Fri, 1 Jan 2016 22:16:25 +0000 (23:16 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 1 Jan 2016 22:16:25 +0000 (23:16 +0100)
Conflicts:
qcsrc/server/mutators/mutator/gamemode_lms.qc

1  2 
qcsrc/common/mutators/mutator/itemstime.qc
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;
  }