#include "main.qh"
-#include "_all.qh"
#include "controlpoint.qh"
-#include "csqcmodel_hooks.qh"
#include "damage.qh"
#include "effects.qh"
#include "generator.qh"
#include "laser.qh"
#include "mapvoting.qh"
#include "modeleffects.qh"
+#include "mutators/events.qh"
#include "particles.qh"
+#include "quickmenu.qh"
#include "scoreboard.qh"
#include "shownames.qh"
#include "tuba.qh"
#include "t_items.qh"
#include "wall.qh"
-
-#include "../common/vehicles/all.qh"
-
-#include "mutators/events.qh"
-
#include "weapons/projectile.qh"
-
-#include "../common/buffs.qh"
-#include "../common/deathtypes.qh"
-#include "../common/effects.qh"
+#include "../common/deathtypes/all.qh"
+#include "../common/items/all.qh"
#include "../common/mapinfo.qh"
-#include "../common/monsters/all.qh"
-#include "../common/nades.qh"
+#include "../common/minigames/cl_minigames.qh"
+#include "../common/minigames/cl_minigames_hud.qh"
#include "../common/net_notice.qh"
-#include "../common/notifications.qh"
-#include "../common/stats.qh"
-#include "../common/teams.qh"
-
-#include "../common/items/all.qh"
-
-#include "../common/mutators/base.qh"
-
-#include "../common/weapons/all.qh"
-
-#include "../csqcmodellib/cl_model.qh"
-#include "../csqcmodellib/interpolate.qh"
-
#include "../common/triggers/include.qh"
-
#include "../common/turrets/cl_turrets.qh"
-#include "../common/turrets/turrets.qh"
-
-#include "../warpzonelib/client.qh"
+#include "../common/vehicles/all.qh"
+#include "../lib/csqcmodel/cl_model.qh"
+#include "../lib/csqcmodel/interpolate.qh"
+#include "../lib/warpzone/client.qh"
// --------------------------------------------------------------------------
// BEGIN REQUIRED CSQC FUNCTIONS
{
}
+void draw_null(entity this) { }
+
string forcefog;
void ConsoleCommand_macro_init();
void CSQC_Init(void)
{
- prvm_language = cvar_string("prvm_language");
+ prvm_language = strzone(cvar_string("prvm_language"));
#ifdef WATERMARK
LOG_TRACEF("^4CSQC Build information: ^1%s\n", WATERMARK);
registercvar("cl_jumpspeedcap_min", "");
registercvar("cl_jumpspeedcap_max", "");
+ registercvar("cl_multijump", "0");
+
+ registercvar("cl_spawn_near_teammate", "1");
+
gametype = 0;
// hud_fields uses strunzone on the titles!
// needs to be done so early because of the constants they create
static_init();
- CALL_ACCUMULATED_FUNCTION(RegisterTurrets);
- CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
- CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
- CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
-
- initialize_minigames();
+ static_init_late();
+ static_init_precache();
// precaches
- precache_model("null");
- precache_sound("misc/hit.wav");
- precache_sound("misc/typehit.wav");
- generator_precache();
Projectile_Precache();
- Hook_Precache();
- GibSplash_Precache();
Tuba_Precache();
- CSQCPlayer_Precache();
if(autocvar_cl_reticle)
{
}
void Playerchecker_Think()
-{
+{SELFPARAM();
int i;
entity e;
for(i = 0; i < maxclients; ++i)
if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
return true;
+ if (QuickMenu_InputEvent(bInputType, nPrimary, nSecondary))
+ return true;
+
if ( HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary) )
return true;
// BEGIN OPTIONAL CSQC FUNCTIONS
void Ent_RemoveEntCS()
-{
- entcs_receiver[self.sv_entnum] = world;
+{SELFPARAM();
+ entcs_receiver[self.sv_entnum] = NULL;
}
void Ent_ReadEntCS()
-{
- int sf;
+{SELFPARAM();
InterpolateOrigin_Undo();
-
self.classname = "entcs_receiver";
- sf = ReadByte();
+ int sf = ReadByte();
- if(sf & 1)
+ if(sf & BIT(0))
self.sv_entnum = ReadByte();
- if(sf & 2)
+ if (sf & BIT(1))
{
self.origin_x = ReadShort();
self.origin_y = ReadShort();
self.origin_z = ReadShort();
setorigin(self, self.origin);
}
- if(sf & 4)
+ if (sf & BIT(2))
{
self.angles_y = ReadByte() * 360.0 / 256;
self.angles_x = self.angles_z = 0;
}
- if(sf & 8)
+ if (sf & BIT(3))
self.healthvalue = ReadByte() * 10;
- if(sf & 16)
+ if (sf & BIT(4))
self.armorvalue = ReadByte() * 10;
entcs_receiver[self.sv_entnum] = self;
void Ent_Remove();
void Ent_RemovePlayerScore()
-{
+{SELFPARAM();
if(self.owner) {
SetTeam(self.owner, -1);
self.owner.gotscores = 0;
}
void Ent_ReadPlayerScore()
-{
+{SELFPARAM();
int i, n;
bool isNew;
entity o;
}
void Ent_ReadTeamScore()
-{
+{SELFPARAM();
int i;
entity o;
int nags = ReadByte(); // NAGS NAGS NAGS NAGS NAGS NAGS NADZ NAGS NAGS NAGS
- if(!(nags & 4))
+ if(!(nags & BIT(2)))
{
if(vote_called_vote)
strunzone(vote_called_vote);
vote_active = 1;
}
- if(nags & 64)
+ if(nags & BIT(6))
{
vote_yescount = ReadByte();
vote_nocount = ReadByte();
vote_highlighted = ReadChar();
}
- if(nags & 128)
+ if(nags & BIT(7))
{
if(vote_called_vote)
strunzone(vote_called_vote);
}
}
- ready_waiting = (nags & 1);
- ready_waiting_for_me = (nags & 2);
- vote_waiting = (nags & 4);
- vote_waiting_for_me = (nags & 8);
- warmup_stage = (nags & 16);
+ ready_waiting = (nags & BIT(0));
+ ready_waiting_for_me = (nags & BIT(1));
+ vote_waiting = (nags & BIT(2));
+ vote_waiting_for_me = (nags & BIT(3));
+ warmup_stage = (nags & BIT(4));
}
void Ent_EliminatedPlayers()
psrandom(s);
}
-void Ent_ReadAccuracy(void)
+void Ent_ReadAccuracy()
{
- int f, w;
int sf = ReadInt24_t();
- if(sf == 0)
- {
- for(w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
+ if (sf == 0) {
+ for (int w = 0; w <= WEP_LAST - WEP_FIRST; ++w)
weapon_accuracy[w] = -1;
return;
}
- for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w)
- {
- if(sf & f)
- {
+ int f = 1;
+ for (int w = 0; w <= WEP_LAST - WEP_FIRST; ++w) {
+ if (sf & f) {
int b = ReadByte();
- if(b == 0)
+ if (b == 0)
weapon_accuracy[w] = -1;
- else if(b == 255)
+ else if (b == 255)
weapon_accuracy[w] = 1.0; // no better error handling yet, sorry
else
weapon_accuracy[w] = (b - 1.0) / 100.0;
}
- if(f == 0x800000)
- f = 1;
- else
- f *= 2;
+ f = (f == 0x800000) ? 1 : f * 2;
}
}
-void Spawn_Draw(void)
+void Spawn_Draw(entity this)
{
- pointparticles(self.cnt, self.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
+ __pointparticles(this.cnt, this.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
}
void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
-{
+{SELFPARAM();
float teamnum = (ReadByte() - 1);
vector spn_origin;
spn_origin.x = ReadShort();
spn_origin.y = ReadShort();
spn_origin.z = ReadShort();
- if(is_new)
- {
+ //if(is_new)
+ //{
self.origin = spn_origin;
setsize(self, PL_MIN_CONST, PL_MAX_CONST);
- droptofloor();
+ //droptofloor();
/*if(autocvar_cl_spawn_point_model) // needs a model first
{
self.draw = Spawn_Draw;
}
- }
+ //}
//printf("Ent_ReadSpawnPoint(is_new = %d); origin = %s, team = %d, effect = %d\n", is_new, vtos(self.origin), teamnum, self.cnt);
}
void Ent_ReadSpawnEvent(float is_new)
-{
+{SELFPARAM();
// If entnum is 0, ONLY do the local spawn actions
// this way the server can disable the sending of
// spawn origin or such to clients if wanted.
{
switch(teamnum)
{
- case NUM_TEAM_1: pointparticles(particleeffectnum(EFFECT_SPAWN_RED), self.origin, '0 0 0', 1); break;
- case NUM_TEAM_2: pointparticles(particleeffectnum(EFFECT_SPAWN_BLUE), self.origin, '0 0 0', 1); break;
- case NUM_TEAM_3: pointparticles(particleeffectnum(EFFECT_SPAWN_YELLOW), self.origin, '0 0 0', 1); break;
- case NUM_TEAM_4: pointparticles(particleeffectnum(EFFECT_SPAWN_PINK), self.origin, '0 0 0', 1); break;
- default: pointparticles(particleeffectnum(EFFECT_SPAWN_NEUTRAL), self.origin, '0 0 0', 1); break;
+ case NUM_TEAM_1: pointparticles(EFFECT_SPAWN_RED, self.origin, '0 0 0', 1); break;
+ case NUM_TEAM_2: pointparticles(EFFECT_SPAWN_BLUE, self.origin, '0 0 0', 1); break;
+ case NUM_TEAM_3: pointparticles(EFFECT_SPAWN_YELLOW, self.origin, '0 0 0', 1); break;
+ case NUM_TEAM_4: pointparticles(EFFECT_SPAWN_PINK, self.origin, '0 0 0', 1); break;
+ default: pointparticles(EFFECT_SPAWN_NEUTRAL, self.origin, '0 0 0', 1); break;
}
}
if(autocvar_cl_spawn_event_sound)
{
- sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTEN_NORM);
+ sound(self, CH_TRIGGER, SND_SPAWN, VOL_BASE, ATTEN_NORM);
}
}
}
void Ent_Init();
void Ent_ScoresInfo();
void CSQC_Ent_Update(float bIsNewEntity)
-{
- float t;
- float savetime;
- t = ReadByte();
+{SELFPARAM();
+ int t = ReadByte();
if(autocvar_developer_csqcentities)
LOG_INFOF("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t);
// set up the "time" global for received entities to be correct for interpolation purposes
- savetime = time;
+ float savetime = time;
if(servertime)
{
time = servertime;
{
if(t != self.enttype || bIsNewEntity)
{
- //print("A CSQC entity changed its type!\n");
LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t);
Ent_Remove();
clearentity(self);
}
#endif
self.enttype = t;
+ bool done = false;
+ FOREACH(LinkedEntities, it.m_id == t, LAMBDA(
+ it.m_read(self, bIsNewEntity);
+ done = true;
+ break;
+ ));
+ if (!done)
switch(t)
{
case ENT_CLIENT_MUTATOR: {
case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
case ENT_CLIENT_TURRET: ent_turret(); break;
case ENT_CLIENT_GENERATOR: ent_generator(); break;
- case ENT_CLIENT_CONTROLPOINT_ICON: ent_cpicon(); break;
+ case ENT_CLIENT_CONTROLPOINT_ICON: ent_cpicon(this); break;
case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;
case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;
case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
case ENT_CLIENT_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break;
case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
- case ENT_CLIENT_HEALING_ORB: ent_healer(); break;
case ENT_CLIENT_MINIGAME: ent_read_minigame(); break;
case ENT_CLIENT_VIEWLOC: ent_viewloc(); break;
case ENT_CLIENT_VIEWLOC_TRIGGER: ent_viewloc_trigger(); break;
// used when an entity changes its type. For an entity that someone interacts
// with others, make sure it can no longer do so.
void Ent_Remove()
-{
+{SELFPARAM();
if(self.entremove)
self.entremove();
if(self.snd_looping > 0)
{
- sound(self, self.snd_looping, "misc/null.wav", VOL_BASE, autocvar_g_jetpack_attenuation);
+ sound(self, self.snd_looping, SND_Null, VOL_BASE, autocvar_g_jetpack_attenuation);
self.snd_looping = 0;
}
self.enttype = 0;
self.classname = "";
- self.draw = menu_sub_null;
+ self.draw = draw_null;
self.entremove = menu_sub_null;
// TODO possibly set more stuff to defaults
}
// CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed. Essentially call remove(self) as well.
void CSQC_Ent_Remove()
-{
+{SELFPARAM();
if(autocvar_developer_csqcentities)
LOG_INFOF("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype);
if(autocvar_developer_csqcentities)
LOG_INFOF("CSQC_Parse_Print(\"%s\")\n", strMessage);
- LOG_INFO(ColorTranslateRGB(strMessage));
+ print(ColorTranslateRGB(strMessage));
}
// CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided.
void Gamemode_Init();
void Ent_ScoresInfo()
-{
+{SELFPARAM();
int i;
self.classname = "ent_client_scores_info";
gametype = ReadInt24_t();
}
void Ent_Init()
-{
+{SELFPARAM();
self.classname = "ent_client_init";
nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th
g_trueaim_minrange = ReadCoord();
g_balance_porto_secondary = ReadByte();
+ MUTATOR_CALLHOOK(Ent_Init);
+
if(!postinit)
PostInit();
}
// CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
// You must ALWAYS first acquire the temporary ID, which is sent as a byte.
// Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
-float CSQC_Parse_TempEntity()
+bool CSQC_Parse_TempEntity()
{
// Acquire TE ID
int nTEID = ReadByte();
if (autocvar_developer_csqcentities)
LOG_INFOF("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID);
+ FOREACH(TempEntities, it.m_id == nTEID, LAMBDA(
+ it.m_read(NULL, true);
+ return true;
+ ));
switch (nTEID)
{
case TE_CSQC_MUTATOR:
projects / xonotic / xonotic-data.pk3dir.git / blobdiff