#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/chat.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/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>
#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
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
{
maxclients = i;
}
+ ReplicateVars(REPLICATEVARS_SEND_ALL);
+
// needs to be done so early because of the constants they create
static_init();
static_init_late();
{
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
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())
deactivate_minigame();
HUD_MinigameMenu_Close(NULL, NULL, NULL);
- ReplicateVars(true); // destroy
+ ReplicateVars(REPLICATEVARS_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;
{
TC(int, bInputType);
bool override = false;
+
override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
if (override)
return true;
+ override |= HUD_Panel_Chat_InputEvent(bInputType, nPrimary, nSecondary);
+
override |= QuickMenu_InputEvent(bInputType, nPrimary, nSecondary);
override |= HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary);
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;
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)
//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);
// 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)
{
}
// 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__);
{
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;
}
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;
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);
}
}
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.
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
}
}
{
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"));
}
}
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();
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;
}
}
+string welcomedialog_args;
+NET_HANDLE(TE_CSQC_SERVERINFO, bool isNew)
+{
+ if(welcomedialog_args)
+ strunzone(welcomedialog_args);
+ welcomedialog_args = strcat("name \"", ReadString(), "\"");
+ welcomedialog_args = strcat(welcomedialog_args, " motd \"", MakeConsoleSafe(strreplace("\n", "\\n", ReadString())), "\"");
+ localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n");
+ welcomedialog_args = string_null;
+ return true;
+}
+
string _getcommandkey(string cmd_name, string command, bool forcename)
{
string keys;
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);
+ }
+}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff