#include "main.qh"
-#include "defs.qh"
+#include <client/items/items.qh>
#include <common/ent_cs.qh>
#include "miscfunctions.qh"
#include <common/effects/effect.qh>
#include <common/effects/all.qh>
#include <common/effects/all.inc>
#include "hud/_mod.qh"
-#include "commands/cl_cmd.qh"
+#include "command/cl_cmd.qh"
#include "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 <common/deathtypes/all.qh>
#include <common/items/_mod.qh>
+#include <common/gamemodes/gamemode/nexball/cl_nexball.qh>
#include <common/mapinfo.qh>
#include <common/minigames/cl_minigames.qh>
#include <common/minigames/cl_minigames_hud.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
registercvar("cl_shootfromfixedorigin", "");
- registercvar("cl_multijump", "1");
+ registercvar("cl_multijump", "-1");
+
+ registercvar("cl_dodging", "0");
registercvar("cl_spawn_near_teammate", "1");
bool SetTeam(entity o, int Team)
{
TC(int, Team);
- devassert_once(Team);
+ //devassert_once(Team);
entity tm;
if(teamplay)
{
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)
{
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"));
}
}
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;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff