Merge branch 'DefaultUser/gametype_votescreen' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / sv_minigames.qc

diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc
index b9a7b78cf86b53894e4a452f25815cc82bd3e365..5f1d1280b9f5a35dd85e2e4d99b6127767ee93c2 100644 (file)
--- a/qcsrc/common/minigames/sv_minigames.qc
+++ b/qcsrc/common/minigames/sv_minigames.qc
@@ -1,13 +1,14 @@
+#include "sv_minigames.qh"
 #include "minigames.qh"
 
 void player_clear_minigame(entity player)
 {
-       player.active_minigame = world;
-       player.minigame_players = world;
+       player.active_minigame = NULL;
+       player.minigame_players = NULL;
        if ( IS_PLAYER(player) )
-               player.movetype = MOVETYPE_WALK;
+               set_movetype(player, MOVETYPE_WALK);
        else
-               player.movetype = MOVETYPE_FLY_WORLDONLY;
+               set_movetype(player, MOVETYPE_FLY_WORLDONLY);
        player.team_forced = 0;
 }
 
@@ -18,7 +19,7 @@ void minigame_rmplayer(entity minigame_session, entity player)
 
        if ( p.minigame_players == player )
        {
-               if ( p.list_next == world )
+               if ( p.list_next == NULL )
                {
                        end_minigame(minigame_session);
                        return;
@@ -27,12 +28,12 @@ void minigame_rmplayer(entity minigame_session, entity player)
                GameLogEcho(strcat(":minigame:part:",minigame_session.netname,":",
                        ftos(etof(player)),":",player.netname));
                minigame_session.minigame_players = p.list_next;
-               remove ( p );
+               delete ( p );
                player_clear_minigame(player);
        }
        else
        {
-               for ( e = p.list_next; e != world; e = e.list_next )
+               for ( e = p.list_next; e != NULL; e = e.list_next )
                {
                        if ( e.minigame_players == player )
                        {
@@ -40,7 +41,7 @@ void minigame_rmplayer(entity minigame_session, entity player)
                                GameLogEcho(strcat(":minigame:part:",minigame_session.netname,":",
                                        ftos(etof(player)),":",player.netname));
                                p.list_next = e.list_next;
-                               remove(e);
+                               delete(e);
                                player_clear_minigame(player);
                                return;
                        }
@@ -105,18 +106,18 @@ bool minigame_SendEntity(entity this, entity to, int sf)
 void minigame_resend(entity minigame)
 {
        minigame.SendFlags = MINIG_SF_ALL;
-       entity e = world;
+       entity e = NULL;
        while (( e = findentity(e,owner,minigame) ))
        {
                e.SendFlags = MINIG_SF_ALL;
        }
 }
 
-bool minigame_CheckSend(entity this)
+bool minigame_CheckSend(entity this, entity client)
 {
        entity e;
-       for ( e = this.owner.minigame_players; e != world; e = e.list_next )
-               if ( e.minigame_players == other )
+       for ( e = this.owner.minigame_players; e != NULL; e = e.list_next )
+               if ( e.minigame_players == client )
                        return true;
        return false;
 }
@@ -153,7 +154,7 @@ int minigame_addplayer(entity minigame_session, entity player)
 
                minigame_resend(minigame_session);
        }
-       else { remove(player_pointer); }
+       else { delete(player_pointer); }
        GameLogEcho(strcat(":minigame:join",(mgteam?"":"fail"),":",minigame_session.netname,":",
                ftos(etof(player)),":",player.netname));
 
@@ -163,7 +164,7 @@ int minigame_addplayer(entity minigame_session, entity player)
 entity start_minigame(entity player, string minigame )
 {
        if ( !autocvar_sv_minigames || !IS_REAL_CLIENT(player) )
-               return world;
+               return NULL;
 
        entity e = minigame_get_descriptor(minigame);
        if ( e )
@@ -176,9 +177,9 @@ entity start_minigame(entity player, string minigame )
                GameLogEcho(strcat(":minigame:start:",minig.netname));
                if ( ! minigame_addplayer(minig,player) )
                {
-                       LOG_TRACE("Minigame ",minig.netname," rejected the first player join!\n");
+                       LOG_TRACE("Minigame ",minig.netname," rejected the first player join!");
                        end_minigame(minig);
-                       return world;
+                       return NULL;
                }
                Net_LinkEntity(minig, false, 0, minigame_SendEntity);
 
@@ -193,23 +194,23 @@ entity start_minigame(entity player, string minigame )
                return minig;
        }
 
-       return world;
+       return NULL;
 }
 
 entity join_minigame(entity player, string game_id )
 {
        if ( !autocvar_sv_minigames || !IS_REAL_CLIENT(player) )
-               return world;
+               return NULL;
 
        entity minig;
-       for ( minig = minigame_sessions; minig != world; minig = minig.list_next )
+       for ( minig = minigame_sessions; minig != NULL; minig = minig.list_next )
        {
                if ( minig.netname == game_id )
                if ( minigame_addplayer(minig,player) )
                        return minig;
        }
 
-       return world;
+       return NULL;
 }
 
 void part_minigame(entity player )
@@ -231,24 +232,24 @@ void end_minigame(entity minigame_session)
        GameLogEcho(strcat(":minigame:end:",minigame_session.netname));
 
 
-       entity e = world;
+       entity e = NULL;
        while( (e = findentity(e, owner, minigame_session)) )
                if ( e.minigame_autoclean )
                {
-                       LOG_TRACE("SV Auto-cleaned: ",ftos(etof(e)), " (",e.classname,")\n");
-                       remove(e);
+                       LOG_TRACE("SV Auto-cleaned: ",ftos(etof(e)), " (",e.classname,")");
+                       delete(e);
                }
 
        entity p;
-       for ( e = minigame_session.minigame_players; e != world; e = p )
+       for ( e = minigame_session.minigame_players; e != NULL; e = p )
        {
                p = e.list_next;
                player_clear_minigame(e.minigame_players);
-               remove(e);
+               delete(e);
        }
 
        strunzone(minigame_session.netname);
-       remove(minigame_session);
+       delete(minigame_session);
 }
 
 void end_minigames()
@@ -282,12 +283,12 @@ string invite_minigame(entity inviter, entity player)
 entity minigame_find_player(entity client)
 {
        if ( ! client.active_minigame )
-               return world;
+               return NULL;
        entity e;
        for ( e = client.active_minigame.minigame_players; e; e = e.list_next )
                if ( e.minigame_players == client )
                        return e;
-       return world;
+       return NULL;
 }
 
 bool MinigameImpulse(entity this, int imp)
@@ -343,7 +344,7 @@ void ClientCommand_minigame(entity caller, int request, int argc, string command
                else if ( minig_cmd == "list-sessions" )
                {
                        entity e;
-                       for ( e = minigame_sessions; e != world; e = e.list_next )
+                       for ( e = minigame_sessions; e != NULL; e = e.list_next )
                                sprint(caller,e.netname,"\n");
                        return;
                }