X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=ca49edd03c42b05442f35eddd6237f8fba8b1409;hb=56a76f26d01e2c48273ee2a446d3afaedcf325d9;hp=b61f425aa6da44b8d9d4f073a7929275f54a5685;hpb=6c319c2baf6bcac5d7f57d097b7773d1f6f23294;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index b61f425aa..ca49edd03 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,31 +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/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 @@ -37,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 @@ -97,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 { @@ -136,7 +85,9 @@ void CSQC_Init() registercvar("cl_shootfromfixedorigin", ""); - registercvar("cl_multijump", "1"); + registercvar("cl_multijump", "-1"); + + registercvar("cl_dodging", "0"); registercvar("cl_spawn_near_teammate", "1"); @@ -172,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 @@ -216,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()) @@ -236,11 +190,133 @@ 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) { TC(int, Team); - devassert_once(Team); + //devassert_once(Team); entity tm; if(teamplay) { @@ -523,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; @@ -671,33 +754,15 @@ NET_HANDLE(ENT_CLIENT_ACCURACY, bool isnew) void Spawn_Draw(entity this) { - if(this.alpha <= 0) - return; - - __pointparticles(this.cnt, this.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1)); -} - -void Spawn_PreDraw(entity this) -{ - float alph; - vector org = getpropertyvec(VF_ORIGIN); - if(this.fade_start) + bool dodraw = autocvar_cl_spawn_point_particles; + if(dodraw && autocvar_cl_spawn_point_dist_max) { - if(vdist(org - this.origin, >, this.fade_end)) - alph = 0; // save on some processing - else if(vdist(org - this.origin, <, this.fade_start)) - alph = 1; // more processing saved - else - alph = bound(0, (this.fade_end - vlen(org - this.origin - 0.5 * (this.mins + this.maxs))) / (this.fade_end - this.fade_start), 1); + vector org = getpropertyvec(VF_ORIGIN); + dodraw = vdist(org - this.origin, <, autocvar_cl_spawn_point_dist_max); } - else - alph = 1; - //printf("%v <-> %v\n", view_origin, this.origin + 0.5 * (this.mins + this.maxs)); - this.alpha = alph; - if(alph <= 0) - this.drawmask = 0; - else - this.drawmask = MASK_NORMAL; + + if(dodraw) + pointparticles(((!teamplay) ? EFFECT_SPAWNPOINT_NEUTRAL : EFFECT_SPAWNPOINT(this.team - 1)), this.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1)); } NET_HANDLE(ENT_CLIENT_SPAWNPOINT, bool is_new) @@ -724,27 +789,8 @@ NET_HANDLE(ENT_CLIENT_SPAWNPOINT, bool is_new) //this.draw = Spawn_Draw; IL_PUSH(g_drawables, this); }*/ - if(autocvar_cl_spawn_point_particles) - { - if(teamplay) - { - switch(teamnum) - { - case NUM_TEAM_1: this.cnt = particleeffectnum(EFFECT_SPAWNPOINT_RED); break; - case NUM_TEAM_2: this.cnt = particleeffectnum(EFFECT_SPAWNPOINT_BLUE); break; - case NUM_TEAM_3: this.cnt = particleeffectnum(EFFECT_SPAWNPOINT_YELLOW); break; - case NUM_TEAM_4: this.cnt = particleeffectnum(EFFECT_SPAWNPOINT_PINK); break; - default: this.cnt = particleeffectnum(EFFECT_SPAWNPOINT_NEUTRAL); break; - } - } - else { this.cnt = particleeffectnum(EFFECT_SPAWNPOINT_NEUTRAL); } - - this.draw = Spawn_Draw; - if (is_new) IL_PUSH(g_drawables, this); - setpredraw(this, Spawn_PreDraw); - this.fade_start = autocvar_cl_spawn_point_dist_min; - this.fade_end = autocvar_cl_spawn_point_dist_max; - } + this.draw = Spawn_Draw; + if (is_new) IL_PUSH(g_drawables, this); //} //printf("Ent_ReadSpawnPoint(is_new = %d); origin = %s, team = %d, effect = %d\n", is_new, vtos(this.origin), teamnum, this.cnt); @@ -788,8 +834,11 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new) // local spawn actions if(is_new && (!entnum || (entnum == player_localentnum))) { - zoomin_effect = 1; - current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16)); + if(autocvar_cl_spawnzoom && !autocvar_cl_lockview) + { + zoomin_effect = 1; + current_viewzoom = (1 / bound(1, autocvar_cl_spawnzoom_factor, 16)); + } if(autocvar_cl_unpress_zoom_on_spawn) { @@ -802,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__); @@ -828,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; } @@ -846,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; @@ -854,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); } } @@ -918,11 +968,11 @@ void CSQC_Parse_Print(string strMessage) print(ColorTranslateRGB(strMessage)); } -// CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided. +// CSQC_Parse_CenterPrint : Provides the centerprint_AddStandard string in the first parameter that the server provided. void CSQC_Parse_CenterPrint(string strMessage) { if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_CenterPrint(\"%s\")", strMessage); - centerprint_hud(strMessage); + centerprint_AddStandard(strMessage); } // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer. @@ -1009,16 +1059,11 @@ float GetSpeedUnitFactor(int speed_unit) switch(speed_unit) { default: - case 1: - return 1.0; - case 2: - return 0.0254; - case 3: - return 0.0254 * 3.6; - case 4: - return 0.0254 * 3.6 * 0.6213711922; - case 5: - return 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h + case 1: return 1.0; + case 2: return 0.0254; + case 3: return 0.0254 * 3.6; + case 4: return 0.0254 * 3.6 * 0.6213711922; + case 5: return 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h } } @@ -1026,17 +1071,13 @@ string GetSpeedUnit(int speed_unit) { switch(speed_unit) { + // translator-friendly strings without the initial space default: - case 1: - return _(" qu/s"); - case 2: - return _(" m/s"); - case 3: - return _(" km/h"); - case 4: - return _(" mph"); - case 5: - return _(" knots"); + case 1: return strcat(" ", _("qu/s")); + case 2: return strcat(" ", _("m/s")); + case 3: return strcat(" ", _("km/h")); + case 4: return strcat(" ", _("mph")); + case 5: return strcat(" ", _("knots")); } } @@ -1142,12 +1183,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(); @@ -1226,7 +1265,7 @@ NET_HANDLE(TE_CSQC_PINGPLREPORT, bool isNew) NET_HANDLE(TE_CSQC_WEAPONCOMPLAIN, bool isNew) { int weapon_id = ReadByte(); - complain_weapon = Weapons_from(weapon_id); + complain_weapon = REGISTRY_GET(Weapons, weapon_id); complain_weapon_type = ReadByte(); return = true; @@ -1292,3 +1331,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); + } +}