Merge branch 'terencehill/spectatee_status_update' into 'master'

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

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index 6fc2400d35a2b8cfee470bea46dbe98c669a3d3b..90f1b2252ec2c816bea0c566a63725be73424891 100644 (file)
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -25,7 +25,7 @@ bool HUD_mouse_over(entity somepanel)
 // Draws the minigame game board
 void HUD_MinigameBoard ()
 {
-       entity hud_minigame = world;
+       entity hud_minigame = NULL;
 
        if(!autocvar__hud_configure)
                hud_minigame = active_minigame.descriptor;
@@ -51,7 +51,7 @@ void HUD_MinigameBoard ()
 // Draws the minigame status panel
 void HUD_MinigameStatus ()
 {
-       entity hud_minigame = world;
+       entity hud_minigame = NULL;
 
        if(!autocvar__hud_configure)
                hud_minigame = active_minigame.descriptor;
@@ -141,9 +141,9 @@ void HUD_MinigameMenu_EraseEntry ( entity e )
                HUD_MinigameMenu_last_entry = e.list_prev;
 
        if ( HUD_MinigameMenu_activeitem == e )
-               HUD_MinigameMenu_activeitem = world;
+               HUD_MinigameMenu_activeitem = NULL;
 
-       remove(e);
+       delete(e);
 }
 
 // Minigame menu options: create entry
@@ -186,14 +186,14 @@ bool HUD_MinigameMenu_Click_ExpandCollapse(entity this)
        {
                if ( HUD_MinigameMenu_activeitem &&
                                HUD_MinigameMenu_activeitem.owner == this )
-                       HUD_MinigameMenu_activeitem = world;
+                       HUD_MinigameMenu_activeitem = NULL;
                this.flags &= ~2;
-               for ( e = this.list_next; e != world && e.owner == this; e = this.list_next )
+               for ( e = this.list_next; e != NULL && e.owner == this; e = this.list_next )
                {
                        if ( e.flags & 2 )
                                HUD_MinigameMenu_Click(e);
                        this.list_next = e.list_next;
-                       remove(e);
+                       delete(e);
                }
                if ( this.list_next )
                        this.list_next.list_prev = this;
@@ -202,7 +202,7 @@ bool HUD_MinigameMenu_Click_ExpandCollapse(entity this)
        }
        else
        {
-               for ( e = HUD_MinigameMenu_entries; e != world; e = e.list_next )
+               for ( e = HUD_MinigameMenu_entries; e != NULL; e = e.list_next )
                {
                        if ( e.flags & 2 && e.origin_x == this.origin_x)
                                HUD_MinigameMenu_Click(e);
@@ -244,7 +244,7 @@ void HUD_MinigameMenu_ClickJoin(entity this, entity actor, entity trigger)
 {
        if ( HUD_MinigameMenu_Click_ExpandCollapse(this) )
        {
-               entity e = world;
+               entity e = NULL;
                entity curr;
                entity prev = this;
                while( (e = find(e,classname,"minigame")) )
@@ -291,7 +291,7 @@ void HUD_MinigameMenu_ClickInvite(entity this, entity actor, entity trigger)
                for(int i = 0; i < maxclients; ++i)
                {
                        if ( player_localnum != i && playerslots[i] && entcs_GetName(i) != "" &&
-                               !findfloat(world,minigame_playerslot,i+1) && playerslots[i].ping )
+                               !findfloat(NULL,minigame_playerslot,i+1) && playerslots[i].ping )
                        {
                                e = HUD_MinigameMenu_SpawnSubEntry(
                                        strzone(entcs_GetName(i)), HUD_MinigameMenu_ClickInvite_Entry,
@@ -348,14 +348,14 @@ void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger)
        if ( HUD_MinigameMenu_IsOpened() )
        {
                entity e, p;
-               for ( e = HUD_MinigameMenu_entries; e != world; e = p )
+               for ( e = HUD_MinigameMenu_entries; e != NULL; e = p )
                {
                        p = e.list_next;
-                       remove(e);
+                       delete(e);
                }
-               HUD_MinigameMenu_entries = world;
-               HUD_MinigameMenu_last_entry = world;
-               HUD_MinigameMenu_activeitem = world;
+               HUD_MinigameMenu_entries = NULL;
+               HUD_MinigameMenu_last_entry = NULL;
+               HUD_MinigameMenu_activeitem = NULL;
                if(autocvar_hud_cursormode)
                if ( !autocvar__hud_configure )
                        setcursormode(0);
@@ -368,7 +368,7 @@ void HUD_MinigameMenu_CurrentButton()
        entity e;
        if ( active_minigame )
        {
-               for ( e = HUD_MinigameMenu_last_entry; e != world; e = e.list_prev )
+               for ( e = HUD_MinigameMenu_last_entry; e != NULL; e = e.list_prev )
                        if ( e.classname == "hud_minigamemenu_exit" )
                        {
                                HUD_MinigameMenu_EraseEntry(e);
@@ -384,7 +384,7 @@ void HUD_MinigameMenu_CurrentButton()
        else
        {
                entity p;
-               for ( e = HUD_MinigameMenu_last_entry; e != world; e = p.list_prev )
+               for ( e = HUD_MinigameMenu_last_entry; e != NULL; e = p.list_prev )
                {
                        p = e;
                        if ( e.classname == "hud_minigamemenu_current" )
@@ -396,7 +396,7 @@ void HUD_MinigameMenu_CurrentButton()
                                break;
                        }
                }
-               for ( e = HUD_MinigameMenu_last_entry; e != world; e = e.list_prev )
+               for ( e = HUD_MinigameMenu_last_entry; e != NULL; e = e.list_prev )
                        if ( e.classname == "hud_minigamemenu_exit" )
                                return;
                entity exit = HUD_MinigameMenu_SpawnEntry(
@@ -418,7 +418,7 @@ void HUD_MinigameMenu_Open()
                        _("Join"),'0 0 0',hud_fontsize*1.5,'0.7 0.84 1', HUD_MinigameMenu_ClickJoin),
                        HUD_MinigameMenu_last_entry );
                HUD_MinigameMenu_CurrentButton();
-               HUD_MinigameMenu_activeitem = world;
+               HUD_MinigameMenu_activeitem = NULL;
                if(autocvar_hud_cursormode)
                        setcursormode(1);
        }
@@ -441,9 +441,9 @@ void HUD_MinigameMenu_MouseInput()
 
        panel_pos_y += hud_fontsize_y*2;
 
-       HUD_MinigameMenu_activeitem = world;
+       HUD_MinigameMenu_activeitem = NULL;
        vector sz;
-       for ( e = HUD_MinigameMenu_entries; e != world; e = e.list_next )
+       for ( e = HUD_MinigameMenu_entries; e != NULL; e = e.list_next )
        {
                sz = eX*panel_size_x + eY*e.size_y;
                if ( e.model )
@@ -493,7 +493,7 @@ void HUD_MinigameMenu ()
        vector offset;
        float itemh;
        vector imgsz = '22 22 0'; // NOTE: if changed, edit where HUD_MinigameMenu_activeitem is selected
-       for ( entity e = HUD_MinigameMenu_entries; e != world; e = e.list_next )
+       for ( entity e = HUD_MinigameMenu_entries; e != NULL; e = e.list_next )
        {
                color = e.colormod;
 
@@ -598,10 +598,10 @@ float HUD_Minigame_InputEvent(float bInputType, float nPrimary, float nSecondary
                }
 
                // allow some binds
-               string con_keys;
-               con_keys = findkeysforcommand("toggleconsole", 0);
+               string con_keys = findkeysforcommand("toggleconsole", 0);
                int keys = tokenize(con_keys); // findkeysforcommand returns data for this
-               for (int i = 0; i < keys; ++i)
+               int i;
+               for (i = 0; i < keys; ++i)
                {
                        if(nPrimary == stof(argv(i)))
                                return false;