X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=6978247abba8c66570587e59ef00e566b87dc28a;hb=ad3343bf4eb25adcac5df5077b6fcd76741480c7;hp=2d2a5c4fbf3427d1555b274ff089919ac3cfaba7;hpb=91024417045b13a85bffa30969b0ebc8527f20a5;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 2d2a5c4fb..6978247ab 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,32 +1,32 @@ #include "main.qh" -#include "defs.qh" -#include -#include "miscfunctions.qh" -#include -#include -#include -#include -#include "hud/_mod.qh" -#include "commands/cl_cmd.qh" -#include "mapvoting.qh" +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "hud/panel/centerprint.qh" -#include "hud/panel/scoreboard.qh" -#include "hud/panel/quickmenu.qh" -#include "shownames.qh" -#include "view.qh" -#include -#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 @@ -38,58 +38,6 @@ #define DP_CSQC_ENTITY_REMOVE_IS_B0RKED -void draw_cursor(vector pos, vector ofs, string img, vector col, float a) -{ - ofs = vec2(ofs.x * SIZE_CURSOR.x, ofs.y * SIZE_CURSOR.y); - drawpic(pos - ofs, strcat(draw_currentSkin, img), SIZE_CURSOR, col, a, DRAWFLAG_NORMAL); -} - -void draw_cursor_normal(vector pos, vector col, float a) -{ - draw_cursor(pos, OFFSET_CURSOR, "/cursor", col, a); -} - -void LoadMenuSkinValues() -{ - int fh = -1; - if(cvar_string("menu_skin") != "") - { - draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin")); - fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ); - } - if(fh < 0 && cvar_defstring("menu_skin") != "") - { - cvar_set("menu_skin", cvar_defstring("menu_skin")); - draw_currentSkin = strcat("gfx/menu/", cvar_string("menu_skin")); - fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ); - } - if(fh < 0) - { - draw_currentSkin = "gfx/menu/default"; - fh = fopen(strcat(draw_currentSkin, "/skinvalues.txt"), FILE_READ); - } - - draw_currentSkin = strzone(draw_currentSkin); - - if(fh >= 0) - { - string s; - while((s = fgets(fh))) - { - int n = tokenize_console(s); - if (n < 2) - continue; - if(substring(argv(0), 0, 2) == "//") - continue; - if(argv(0) == "SIZE_CURSOR") - SIZE_CURSOR = stov(substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))); - else if(argv(0) == "OFFSET_CURSOR") - OFFSET_CURSOR = stov(substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))); - } - fclose(fh); - } -} - // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load) // Useful for precaching things @@ -98,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 { @@ -219,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()) @@ -239,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) { @@ -526,12 +599,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; @@ -771,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__); @@ -815,7 +895,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; @@ -823,7 +903,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); } } @@ -1252,3 +1332,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); + } +}