X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=252c5032dee4f7687dd5af0d3bc04e6673274393;hb=cb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c;hp=adf5496835774f60b3e734438e148d06bbf2682d;hpb=24ef7f8d5194b61d9c2a4aca1408d0b93c269bb8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index adf549683..252c5032d 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -1,15 +1,17 @@ #include "csqcmodel_hooks.qh" -#include "autocvars.qh" -#include "miscfunctions.qh" + #include -#include "player_skeleton.qh" -#include "weapons/projectile.qh" +#include +#include #include +#include +#include #include +#include +#include #include +#include #include -#include -#include #include #include #include @@ -133,6 +135,9 @@ void CSQCPlayer_ModelAppearance_PostUpdate(entity this) } void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) { + int cm = this.forceplayermodels_savecolormap; + cm = (cm >= 1024) ? cm : (entcs_GetClientColors(cm - 1) + 1024); + if(MUTATOR_CALLHOOK(ForcePlayermodels_Skip, this, islocalplayer)) goto skipforcemodels; @@ -193,9 +198,6 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) // apply it bool isfriend; - int cm; - cm = this.forceplayermodels_savecolormap; - cm = (cm >= 1024) ? cm : (entcs_GetClientColors(cm - 1) + 1024); if(teamplay) isfriend = (cm == 1024 + 17 * myteam); @@ -227,17 +229,40 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) this.skin = this.forceplayermodels_saveskin; } + LABEL(skipforcemodels) + + if(MUTATOR_CALLHOOK(ForcePlayercolors_Skip, this, islocalplayer)) + goto skipforcecolors; + + bool forceplayercolors_enabled = false; + #define fpc autocvar_cl_forceplayercolors + if (ISGAMETYPE(DUEL)) + { + if ((myteam != NUM_SPECTATOR) && (fpc == 1 || fpc == 2 || fpc == 3 || fpc == 5)) + forceplayercolors_enabled = true; + } + else if (teamplay) + { + if ((team_count == 2) && (myteam != NUM_SPECTATOR) && (fpc == 2 || fpc == 4 || fpc == 5)) + forceplayercolors_enabled = true; + } + else + { + if (fpc == 1 || fpc == 2) + forceplayercolors_enabled = true; + } + // forceplayercolors too if(teamplay) { // own team's color is never forced - int forcecolor_friend = 0; - int forcecolor_enemy = 0; + int forcecolor_friend = 0, forcecolor_enemy = 0; entity tm; if(autocvar_cl_forcemyplayercolors) forcecolor_friend = 1024 + autocvar_cl_forcemyplayercolors; - if(autocvar_cl_forceplayercolors == 2 && team_count == 2) + + if(forceplayercolors_enabled) forcecolor_enemy = 1024 + autocvar__cl_color; if(forcecolor_enemy && !forcecolor_friend) @@ -272,19 +297,30 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) this.colormap = forcecolor_enemy; } } - else + else // if(!teamplay) { if(autocvar_cl_forcemyplayercolors && islocalplayer) this.colormap = 1024 + autocvar_cl_forcemyplayercolors; - else if(autocvar_cl_forceplayercolors) + else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !ISGAMETYPE(DUEL)) + { + // Assign each enemy unique colors + // pick colors from 0 to 14 since 15 is the rainbow color + // pl01 0 1, pl02 1 2, ..., pl14 13 14, pl15 14 0 + // pl16 0 2, pl17 1 3, ..., pl29 13 0, pl30 14 1 + int num = this.entnum - 1; + int c1 = num % 15; + int q = floor(num / 15); + int c2 = (c1 + 1 + q) % 15; + this.colormap = 1024 + (c1 << 4) + c2; + } + else if(forceplayercolors_enabled) this.colormap = player_localnum + 1; } - LABEL(skipforcemodels) + LABEL(skipforcecolors) - if(this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST) + if((this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST) && !autocvar_cl_respawn_ghosts_keepcolors) { - // no glowmod or team colors for ghosts this.glowmod = '0 0 0'; this.colormap = 0; return; @@ -415,7 +451,7 @@ void CSQCModel_AutoTagIndex_Apply(entity this) } // recursive predraw call to fix issues with forcemodels and LOD if bone indexes mismatch - if(this.tag_entity.classname == "csqcmodel") + if(this.tag_entity.classname == "ENT_CLIENT_MODEL") { CSQCModel_Hook_PreDraw(this.tag_entity, (this.tag_entity.isplayermodel & ISPLAYER_CLIENT)); } @@ -521,9 +557,15 @@ void CSQCModel_Effects_Apply(entity this) if(eff & EF_FULLBRIGHT) this.renderflags |= RF_FULLBRIGHT; if(eff & EF_FLAME) - pointparticles(EFFECT_EF_FLAME, this.origin, '0 0 0', bound(0, frametime, 0.1)); + { + boxparticles(particleeffectnum(EFFECT_EF_FLAME), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0); + //pointparticles(EFFECT_EF_FLAME, this.origin, '0 0 0', bound(0, frametime, 0.1)); + } if(eff & EF_STARDUST) - pointparticles(EFFECT_EF_STARDUST, this.origin, '0 0 0', bound(0, frametime, 0.1)); + { + boxparticles(particleeffectnum(EFFECT_EF_STARDUST), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0); + //pointparticles(EFFECT_EF_STARDUST, this.origin, '0 0 0', bound(0, frametime, 0.1)); + } if(eff & EF_NOSHADOW) this.renderflags |= RF_NOSHADOW; if(eff & EF_NODEPTHTEST) @@ -605,7 +647,7 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer) return; this.csqcmodel_predraw_run = framecount; - if(!this.modelindex || this.model == "null" || this.alpha < 0) + if(!this.modelindex || this.model == "null") { this.drawmask = 0; if(this.snd_looping > 0) @@ -661,6 +703,8 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer) tracebox(this.origin + '0 0 1', this.mins, this.maxs, this.origin - '0 0 4', MOVE_NORMAL, this); if(trace_startsolid || trace_fraction < 1) onground = 1; + // predicted clients handle smoothing in the prediction code + this.origin = CSQCModel_ApplyStairSmoothing(this, onground, this.origin); } animdecide_load_if_needed(this); animdecide_setimplicitstate(this, onground); @@ -723,6 +767,7 @@ void CSQCModel_Hook_PostUpdate(entity this, bool isnew, bool isplayer, bool islo bool is_playermodel = (substring(this.model, 0, 14) == "models/player/" || substring(this.model, 0, 17) == "models/ok_player/" || (substring(this.model, 0, 16) == "models/monsters/" && (this.isplayermodel & BIT(1)))); this.isplayermodel = BITSET(this.isplayermodel, ISPLAYER_MODEL, is_playermodel); + this.csqcmodel_isdead = false; // workaround for dead players who become a spectator // save values set by server if((this.isplayermodel & ISPLAYER_MODEL))