X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=20f949bf3fc70b68f6e513c1412503a20531bc6d;hb=9e92e0e5bdad9052ff3463f67f3fb5a2ab812ed2;hp=bb60a917d5f19a216d4f550bccdee78ca6b92b9a;hpb=ceb30359c438be5c6c6257d65e92191431465e1a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index bb60a917d..20f949bf3 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,5 +1,4 @@ #include "main.qh" -#include "_all.qh" #include "controlpoint.qh" #include "damage.qh" @@ -12,44 +11,27 @@ #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/all.qh" -#include "../common/deathtypes.qh" -#include "../common/effects/effects.qh" +#include "../common/deathtypes/all.qh" +#include "../common/items/all.qh" #include "../common/mapinfo.qh" -#include "../common/monsters/all.qh" -#include "../common/nades/all.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 "../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 @@ -148,9 +130,8 @@ void CSQC_Init(void) // needs to be done so early because of the constants they create static_init(); - CALL_ACCUMULATED_FUNCTION(RegisterNotifications); - CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes); - CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels); + static_init_late(); + static_init_precache(); // precaches @@ -578,7 +559,7 @@ void Ent_Nagger() 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); @@ -590,7 +571,7 @@ void Ent_Nagger() vote_active = 1; } - if(nags & 64) + if(nags & BIT(6)) { vote_yescount = ReadByte(); vote_nocount = ReadByte(); @@ -598,7 +579,7 @@ void Ent_Nagger() vote_highlighted = ReadChar(); } - if(nags & 128) + if(nags & BIT(7)) { if(vote_called_vote) strunzone(vote_called_vote); @@ -620,11 +601,11 @@ void Ent_Nagger() } } - 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() @@ -656,39 +637,33 @@ void Ent_RandomSeed() 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(entity this) { - pointparticles(this.cnt, this.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 @@ -699,11 +674,11 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint 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 { @@ -732,7 +707,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint 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); } @@ -758,11 +733,11 @@ void Ent_ReadSpawnEvent(float is_new) { 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) @@ -1063,6 +1038,8 @@ void Ent_Init() g_trueaim_minrange = ReadCoord(); g_balance_porto_secondary = ReadByte(); + MUTATOR_CALLHOOK(Ent_Init); + if(!postinit) PostInit(); }