Merge branch 'master' into terencehill/scoreboard_panel_2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / miscfunctions.qc

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 8c0bf14ea432a2c120f9f6bbb80a8ab381875436..01b0ee3cb440c09d4b00503500f9a2561d697fd7 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -68,11 +68,11 @@ void RemovePlayer(entity player)
 void MoveToLast(entity e)
 {
        AuditLists();
-       other = e.sort_next;
-       while(other)
+       entity ent = e.sort_next;
+       while(ent)
        {
-               SORT_SWAP(other, e);
-               other = e.sort_next;
+               SORT_SWAP(ent, e);
+               ent = e.sort_next;
        }
        AuditLists();
 }
@@ -124,7 +124,7 @@ entity GetTeam(int Team, bool add)
        if(teamslots[num])
                return teamslots[num];
        if (!add)
-               return world;
+               return NULL;
        entity tm = new_pure(team);
        tm.team = Team;
        teamslots[num] = tm;