#includes: cleanup server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_lms.qc

diff --git a/qcsrc/server/mutators/gamemode_lms.qc b/qcsrc/server/mutators/gamemode_lms.qc
index 61e51451fbaf9d354407568d20706a92b857fa5a..b3cf0db6acd4464dddcb923871d47210944c3d54 100644 (file)
--- a/qcsrc/server/mutators/gamemode_lms.qc
+++ b/qcsrc/server/mutators/gamemode_lms.qc
@@ -1,5 +1,4 @@
 #include "gamemode_lms.qh"
-#include "../_all.qh"
 
 #include "gamemode.qh"
 
@@ -35,34 +34,40 @@ MUTATOR_HOOKFUNCTION(lms_ResetMap)
 }
 
 MUTATOR_HOOKFUNCTION(lms_ResetPlayers)
-{
+{SELFPARAM();
+       entity e;
        if(restart_mapalreadyrestarted || (time < game_starttime))
-       FOR_EACH_CLIENT(self)
-       if(IS_PLAYER(self))
-               PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives());
+       FOR_EACH_CLIENT(e)
+       if(IS_PLAYER(e))
+       {
+               WITH(entity, self, e, PlayerScore_Add(e, SP_LMS_LIVES, LMS_NewPlayerLives()));
+       }
 
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms_PlayerPreSpawn)
-{
+{SELFPARAM();
        // player is dead and becomes observer
        // FIXME fix LMS scoring for new system
        if(PlayerScore_Add(self, SP_LMS_RANK, 0) > 0)
+       {
                self.classname = "observer";
+               Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_LMS_NOLIVES);
+       }
 
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms_PlayerDies)
-{
+{SELFPARAM();
        self.respawn_flags |= RESPAWN_FORCE;
 
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(lms_RemovePlayer)
-{
+{SELFPARAM();
        // Only if the player cannot play at all
        if(PlayerScore_Add(self, SP_LMS_RANK, 0) == 666)
                self.frags = FRAGS_SPECTATOR;
@@ -79,7 +84,7 @@ MUTATOR_HOOKFUNCTION(lms_RemovePlayer)
 }
 
 MUTATOR_HOOKFUNCTION(lms_ClientConnect)
-{
+{SELFPARAM();
        self.classname = "player";
        campaign_bots_may_start = 1;
 
@@ -93,7 +98,7 @@ MUTATOR_HOOKFUNCTION(lms_ClientConnect)
 }
 
 MUTATOR_HOOKFUNCTION(lms_PlayerThink)
-{
+{SELFPARAM();
        if(self.deadflag == DEAD_DYING)
                self.deadflag = DEAD_RESPAWNING;
 
@@ -156,9 +161,9 @@ MUTATOR_HOOKFUNCTION(lms_KeepScore)
 }
 
 MUTATOR_HOOKFUNCTION(lms_FilterItem)
-{
+{SELFPARAM();
        if(autocvar_g_lms_extra_lives)
-       if(self.classname == "item_health_mega")
+       if(self.itemdef == ITEM_HealthMega)
        {
                self.max_health = 1;
                return false;
@@ -168,9 +173,9 @@ MUTATOR_HOOKFUNCTION(lms_FilterItem)
 }
 
 MUTATOR_HOOKFUNCTION(lms_ItemTouch)
-{
+{SELFPARAM();
        // give extra lives for mega health
-       if(self.items & IT_HEALTH)
+       if (self.items & ITEM_HealthMega.m_itemid)
        {
                Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_EXTRALIVES);
                PlayerScore_Add(other, SP_LMS_LIVES, autocvar_g_lms_extra_lives);
@@ -229,7 +234,7 @@ MUTATOR_DEFINITION(gamemode_lms)
 
        MUTATOR_ONREMOVE
        {
-               print("This is a game type and it cannot be removed at runtime.");
+               LOG_INFO("This is a game type and it cannot be removed at runtime.");
                return -1;
        }