]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/main.qc
Merge branch 'master' into terencehill/scoreboard_ui
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc
index 4d187e23cf02f12a800cffbd02a5328fa511bb73..b6114910e95653545b22a34b09586709b0117761 100644 (file)
@@ -1,32 +1,32 @@
 #include "main.qh"
 
-#include "defs.qh"
-#include <common/ent_cs.qh>
-#include "miscfunctions.qh"
-#include <common/effects/effect.qh>
-#include <common/effects/qc/_mod.qh>
-#include <common/effects/all.qh>
-#include <common/effects/all.inc>
-#include "hud/_mod.qh"
-#include "commands/cl_cmd.qh"
-#include "mapvoting.qh"
+#include <client/command/cl_cmd.qh>
+#include <client/draw.qh>
+#include <client/hud/_mod.qh>
+#include <client/hud/panel/centerprint.qh>
+#include <client/hud/panel/quickmenu.qh>
+#include <client/hud/panel/scoreboard.qh>
+#include <client/items/items.qh>
+#include <client/mapvoting.qh>
 #include <client/mutators/_mod.qh>
-#include "hud/panel/centerprint.qh"
-#include "hud/panel/scoreboard.qh"
-#include "hud/panel/quickmenu.qh"
-#include "shownames.qh"
-#include "view.qh"
-#include <common/t_items.qh>
-#include "weapons/projectile.qh"
+#include <client/shownames.qh>
+#include <client/view.qh>
+#include <client/weapons/projectile.qh>
 #include <common/deathtypes/all.qh>
+#include <common/effects/all.inc>
+#include <common/effects/all.qh>
+#include <common/effects/effect.qh>
+#include <common/effects/qc/_mod.qh>
+#include <common/ent_cs.qh>
+#include <common/gamemodes/gamemode/nexball/cl_nexball.qh>
 #include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
+#include <common/mapobjects/_mod.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
 #include <common/net_linked.qh>
 #include <common/net_notice.qh>
 #include <common/scores.qh>
-#include <common/mapobjects/_mod.qh>
 #include <common/vehicles/all.qh>
 #include <lib/csqcmodel/cl_model.qh>
 #include <lib/csqcmodel/interpolate.qh>
@@ -46,7 +46,7 @@ void CSQC_Init()
        prvm_language = strzone(cvar_string("prvm_language"));
 
 #ifdef WATERMARK
-       LOG_INFOF("^4CSQC Build information: ^1%s", WATERMARK);
+       LOG_TRACEF("^4CSQC Build information: ^1%s", WATERMARK);
 #endif
 
        {
@@ -123,13 +123,13 @@ void CSQC_Init()
 
        {
                get_mi_min_max_texcoords(1); // try the CLEVER way first
-               minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
+               minimapname = strcat("gfx/", mi_shortname, "_radar");
                shortmapname = mi_shortname;
 
                if (precache_pic(minimapname) == "")
                {
                        // but maybe we have a non-clever minimap
-                       minimapname = strcat("gfx/", mi_shortname, "_mini.tga");
+                       minimapname = strcat("gfx/", mi_shortname, "_mini");
                        if (precache_pic(minimapname) == "")
                                minimapname = ""; // FAIL
                        else
@@ -167,6 +167,9 @@ void Shutdown()
        if(autocvar_chase_active < 0)
                cvar_set("chase_active", "0");
 
+       if (autocvar_r_drawviewmodel < 0)
+               cvar_set("r_drawviewmodel", "0");
+
        cvar_set("slowmo", cvar_defstring("slowmo")); // reset it back to 'default'
 
        if (!isdemo())
@@ -187,6 +190,128 @@ void Shutdown()
        ReplicateVars(true); // destroy
 }
 
+void AuditLists()
+{
+       entity e;
+       entity prev;
+
+       prev = players;
+       for(e = prev.sort_next; e; prev = e, e = e.sort_next)
+       {
+               if(prev != e.sort_prev)
+                       error(strcat("sort list chain error\nplease submit the output of 'prvm_edicts client' to the developers"));
+       }
+
+       prev = teams;
+       for(e = prev.sort_next; e; prev = e, e = e.sort_next)
+       {
+               if(prev != e.sort_prev)
+                       error(strcat("sort list chain error\nplease submit the output of 'prvm_edicts client' to the developers"));
+       }
+}
+
+float RegisterPlayer(entity player)
+{
+       entity pl;
+       AuditLists();
+       for(pl = players.sort_next; pl; pl = pl.sort_next)
+               if(pl == player)
+                       error("Player already registered!");
+       player.sort_next = players.sort_next;
+       player.sort_prev = players;
+       if(players.sort_next)
+               players.sort_next.sort_prev = player;
+       players.sort_next = player;
+       AuditLists();
+       return true;
+}
+
+void RemovePlayer(entity player)
+{
+       entity pl, parent;
+       AuditLists();
+       parent = players;
+       for(pl = players.sort_next; pl && pl != player; pl = pl.sort_next)
+               parent = pl;
+
+       if(!pl)
+       {
+               error("Trying to remove a player which is not in the playerlist!");
+               return;
+       }
+       parent.sort_next = player.sort_next;
+       if(player.sort_next)
+               player.sort_next.sort_prev = parent;
+       AuditLists();
+}
+
+void MoveToLast(entity e)
+{
+       AuditLists();
+       entity ent = e.sort_next;
+       while(ent)
+       {
+               SORT_SWAP(ent, e);
+               ent = e.sort_next;
+       }
+       AuditLists();
+}
+
+float RegisterTeam(entity Team)
+{
+       assert_once(Team.team, eprint(Team));
+       entity tm;
+       AuditLists();
+       for(tm = teams.sort_next; tm; tm = tm.sort_next)
+               if(tm == Team)
+                       error("Team already registered!");
+       Team.sort_next = teams.sort_next;
+       Team.sort_prev = teams;
+       if(teams.sort_next)
+               teams.sort_next.sort_prev = Team;
+       teams.sort_next = Team;
+       if(Team.team && Team.team != NUM_SPECTATOR)
+               ++team_count;
+       AuditLists();
+       return true;
+}
+
+void RemoveTeam(entity Team)
+{
+       entity tm, parent;
+       AuditLists();
+       parent = teams;
+       for(tm = teams.sort_next; tm && tm != Team; tm = tm.sort_next)
+               parent = tm;
+
+       if(!tm)
+       {
+               LOG_INFO(_("Trying to remove a team which is not in the teamlist!"));
+               return;
+       }
+       parent.sort_next = Team.sort_next;
+       if(Team.sort_next)
+               Team.sort_next.sort_prev = parent;
+       if(Team.team && Team.team != NUM_SPECTATOR)
+               --team_count;
+       AuditLists();
+}
+
+entity GetTeam(int Team, bool add)
+{
+       TC(int, Team); TC(bool, add);
+       int num = (Team == NUM_SPECTATOR) ? 16 : Team;
+       if(teamslots[num])
+               return teamslots[num];
+       if (!add)
+               return NULL;
+       entity tm = new_pure(team);
+       tm.team = Team;
+       teamslots[num] = tm;
+       RegisterTeam(tm);
+       return tm;
+}
+
 .float has_team;
 bool SetTeam(entity o, int Team)
 {
@@ -325,6 +450,10 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
 {
        TC(int, bInputType);
        bool override = false;
+       override |= HUD_Scoreboard_InputEvent(bInputType, nPrimary, nSecondary);
+       if (override)
+               return true;
+
        override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
        if (override)
                return true;
@@ -474,12 +603,19 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
                for(i = 0; i < MAX_SPECTATORS; ++i)
                        spectatorlist[i] = 0; // reset list first
 
-               for(i = 0; i < num_spectators; ++i)
+               int limit = min(num_spectators, MAX_SPECTATORS);
+               for(i = 0; i < limit; ++i)
                {
                        slot = ReadByte();
                        spectatorlist[i] = slot - 1;
                }
        }
+       else
+       {
+               for(int j = 0; j < MAX_SPECTATORS; ++j)
+                       spectatorlist[j] = 0; // reset list if showspectators has been turned off
+               num_spectators = 0;
+       }
 
        return = true;
 
@@ -719,7 +855,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new)
 }
 
 // CSQC_Ent_Update : Called every frame that the server has indicated an update to the SSQC / CSQC entity has occured.
-// The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
+// The parameter isnew reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
 void CSQC_Ent_Update(entity this, bool isnew)
 {
        this.sourceLoc = __FILE__":"STR(__LINE__);
@@ -745,6 +881,7 @@ void CSQC_Ent_Update(entity this, bool isnew)
                {
                        LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)", etof(this), this.entnum, this.enttype, t);
                        Ent_Remove(this);
+                       ONREMOVE(this);
                        clearentity(this);
                        isnew = true;
                }
@@ -763,7 +900,7 @@ void CSQC_Ent_Update(entity this, bool isnew)
        FOREACH(LinkedEntities, it.m_id == t, {
                if (isnew) this.classname = it.netname;
                if (autocvar_developer_csqcentities)
-            LOG_INFOF("CSQC_Ent_Update(%d) at %f with this=%i {.entnum=%d, .enttype=%d} t=%s (%d)", isnew, savetime, this, this.entnum, this.enttype, this.classname, t);
+                       LOG_INFOF("CSQC_Ent_Update(%i, %d) at %f {.entnum=%d, .enttype=%d} t=%s (%d)", this, isnew, savetime, this.entnum, this.enttype, this.classname, t);
                done = it.m_read(this, NULL, isnew);
                MUTATOR_CALLHOOK(Ent_Update, this, isnew);
                break;
@@ -771,7 +908,7 @@ void CSQC_Ent_Update(entity this, bool isnew)
        time = savetime;
        if (!done)
        {
-               LOG_FATALF("CSQC_Ent_Update(%d) at %f with this=%i {.entnum=%d, .enttype=%d} t=%s (%d)", isnew, savetime, this, this.entnum, this.enttype, this.classname, t);
+               LOG_FATALF("CSQC_Ent_Update(%i, %d) at %f {.entnum=%d, .enttype=%d} t=%s (%d)", this, isnew, savetime, this.entnum, this.enttype, this.classname, t);
        }
 }
 
@@ -1050,12 +1187,10 @@ NET_HANDLE(TE_CSQC_RACE, bool isNew)
                case RACE_NET_SPEED_AWARD:
                        race_speedaward = ReadInt24_t() * GetSpeedUnitFactor(autocvar_hud_panel_physics_speed_unit);
                        strcpy(race_speedaward_holder, ReadString());
-                       strcpy(race_speedaward_unit, GetSpeedUnit(autocvar_hud_panel_physics_speed_unit));
                        break;
                case RACE_NET_SPEED_AWARD_BEST:
                        race_speedaward_alltimebest = ReadInt24_t() * GetSpeedUnitFactor(autocvar_hud_panel_physics_speed_unit);
                        strcpy(race_speedaward_alltimebest_holder, ReadString());
-                       strcpy(race_speedaward_alltimebest_unit, GetSpeedUnit(autocvar_hud_panel_physics_speed_unit));
                        break;
                case RACE_NET_RANKINGS_CNT:
                        RANKINGS_DISPLAY_CNT = ReadByte();
@@ -1200,3 +1335,26 @@ string _getcommandkey(string cmd_name, string command, bool forcename)
        else
                return keys;
 }
+
+/** engine callback */
+void URI_Get_Callback(int id, int status, string data)
+{
+       TC(int, id); TC(int, status);
+       if(url_URI_Get_Callback(id, status, data))
+       {
+               // handled
+       }
+       else if (id == URI_GET_DISCARD)
+       {
+               // discard
+       }
+       else if (id >= URI_GET_CURL && id <= URI_GET_CURL_END)
+       {
+               // sv_cmd curl
+               Curl_URI_Get_Callback(id, status, data);
+       }
+       else
+       {
+               LOG_INFOF("Received HTTP request data for an invalid id %d.", id);
+       }
+}