X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fmain.qc;h=757effd99bf766574f3fb328e25766ad5e782a90;hb=82f9f23270c9adc2c6c0854fdbc7b303c3647114;hp=ad11dbd296254b5bdbf580109d0b9b3276278d2e;hpb=d44927502027bfa3ccd6ccc98d9b7d6285c182c3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index ad11dbd29..757effd99 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,32 +1,32 @@ #include "main.qh" +#include +#include +#include +#include +#include +#include #include -#include -#include "miscfunctions.qh" -#include -#include -#include -#include -#include "hud/_mod.qh" -#include "command/cl_cmd.qh" -#include "mapvoting.qh" +#include #include -#include "hud/panel/centerprint.qh" -#include "hud/panel/scoreboard.qh" -#include "hud/panel/quickmenu.qh" -#include "shownames.qh" -#include "view.qh" -#include "weapons/projectile.qh" +#include +#include +#include #include -#include +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include #include #include -#include #include #include #include @@ -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) { @@ -726,7 +851,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__); @@ -752,6 +877,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; } @@ -770,7 +896,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; @@ -778,7 +904,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); } } @@ -1207,3 +1333,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); + } +}