-#if defined(CSQC)
- #include "gibs.qh"
- #include "miscfunctions.qh"
- #include "player_skeleton.qh"
- #include "sortlist.qh"
+#include "csqcmodel_hooks.qh"
+#include "_all.qh"
- #include "../client/weapons/projectile.qh"
+#include "gibs.qh"
+#include "player_skeleton.qh"
- #include "../common/animdecide.qh"
- #include "../common/csqcmodel_settings.qh"
+#include "weapons/projectile.qh"
- #include "../csqcmodellib/cl_model.qh"
- #include "../csqcmodellib/cl_player.qh"
- #include "../csqcmodellib/interpolate.qh"
+#include "../common/animdecide.qh"
+#include "../common/csqcmodel_settings.qh"
+#include "../common/effects.qh"
+#include "../common/teams.qh"
+#include "../common/triggers/trigger/viewloc.qh"
- #include "../warpzonelib/mathlib.qh"
+#include "mutators/events.qh"
+
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/cl_player.qh"
+#include "../csqcmodellib/interpolate.qh"
- .float death_time;
- .int modelflags;
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+.float death_time;
+.int modelflags;
void CSQCModel_Hook_PreDraw(bool isplayer);
self.forceplayermodels_isgoodmodel = fexists(self.forceplayermodels_savemodel);
self.forceplayermodels_isgoodmodel_mdl = self.forceplayermodels_savemodel;
if(!self.forceplayermodels_isgoodmodel)
- printf("Warning: missing model %s has been used\n", self.forceplayermodels_savemodel);
+ LOG_INFOF("Warning: missing model %s has been used\n", self.forceplayermodels_savemodel);
}
}
void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
case 29: return 4; // anim_duckwalkbackright -> anim_duckwalk
case 30: return 4; // anim_duckwalkbackleft -> anim_duckwalk
}
- printf("Frame %d missing in model %s, and we have no fallback - FAIL!\n", f, self.model);
+ LOG_INFOF("Frame %d missing in model %s, and we have no fallback - FAIL!\n", f, self.model);
return f;
}
void CSQCPlayer_FallbackFrame_Apply(void)
if(self.tag_entity && wasfreed(self.tag_entity))
self.tag_entity = world;
+ if(self.viewloc && wasfreed(self.viewloc))
+ self.viewloc = world;
+
+ if(self.viewloc.entnum != self.tag_networkviewloc)
+ self.viewloc = findfloat(world, entnum, self.tag_networkviewloc);
+
+ MUTATOR_CALLHOOK(TagIndex_Update, self);
+
if(self.tag_networkentity)
{
// we are ATTACHED!
if(self.tag_entity)
{
// the best part is: IT EXISTS
- if(substring(self.model, 0, 17) == "models/weapons/v_")
+ if(substring(self.model, 0, 14) == "models/weapons")
{
- if(substring(self.tag_entity.model, 0, 17) == "models/weapons/h_")
+ if(substring(self.tag_entity.model, 0, 14) == "models/weapons")
{
self.tag_index = gettagindex(self.tag_entity, "weapon");
if(!self.tag_index)
// we need to prevent this from 'appening
self.tag_entity = world;
self.drawmask = 0;
- dprint("h_ model lacks weapon attachment, but v_ model is attached to it\n");
+ LOG_TRACE("h_ model lacks weapon attachment, but v_ model is attached to it\n");
}
}
else if(self.tag_entity.isplayermodel)
}
}
- if(substring(self.tag_entity.model, 0, 17) == "models/weapons/v_")
+ if(substring(self.tag_entity.model, 0, 14) == "models/weapons")
{
self.tag_index = gettagindex(self.tag_entity, "shot");
if(!self.tag_index)
self.tag_index = gettagindex(self.tag_entity, "tag_shot");
}
+
+ MUTATOR_CALLHOOK(TagIndex_Apply, self);
}
else
{
self.traileffect = 0;
if(eff & EF_BRIGHTFIELD)
- self.traileffect = particleeffectnum("TR_NEXUIZPLASMA");
+ self.traileffect = particleeffectnum(EFFECT_TR_NEXUIZPLASMA);
// ignoring EF_MUZZLEFLASH
if(eff & EF_BRIGHTLIGHT)
adddynamiclight(self.origin, 400, '3 3 3');
if(eff & EF_FULLBRIGHT)
self.renderflags |= RF_FULLBRIGHT;
if(eff & EF_FLAME)
- pointparticles(particleeffectnum("EF_FLAME"), self.origin, '0 0 0', bound(0, frametime, 0.1));
+ pointparticles(particleeffectnum(EFFECT_EF_FLAME), self.origin, '0 0 0', bound(0, frametime, 0.1));
if(eff & EF_STARDUST)
- pointparticles(particleeffectnum("EF_STARDUST"), self.origin, '0 0 0', bound(0, frametime, 0.1));
+ pointparticles(particleeffectnum(EFFECT_EF_STARDUST), self.origin, '0 0 0', bound(0, frametime, 0.1));
if(eff & EF_NOSHADOW)
self.renderflags |= RF_NOSHADOW;
if(eff & EF_NODEPTHTEST)
self.renderflags |= RF_DYNAMICMODELLIGHT;
// ignoring EF_UNUSED18, EF_UNUSED19, EF_RESTARTANIM_BIT, EF_TELEPORT_BIT, EF_LOWPRECISION
if(self.csqcmodel_modelflags & MF_ROCKET)
- self.traileffect = particleeffectnum("TR_ROCKET");
+ self.traileffect = particleeffectnum(EFFECT_TR_ROCKET);
if(self.csqcmodel_modelflags & MF_GRENADE)
- self.traileffect = particleeffectnum("TR_GRENADE");
+ self.traileffect = particleeffectnum(EFFECT_TR_GRENADE);
if(self.csqcmodel_modelflags & MF_GIB)
- self.traileffect = particleeffectnum("TR_BLOOD");
+ self.traileffect = particleeffectnum(EFFECT_TR_BLOOD);
if(self.csqcmodel_modelflags & MF_ROTATE)
{
self.renderflags |= RF_USEAXIS;
makevectors(self.angles + '0 100 0' * fmod(time, 3.6));
}
if(self.csqcmodel_modelflags & MF_TRACER)
- self.traileffect = particleeffectnum("TR_WIZSPIKE");
+ self.traileffect = particleeffectnum(EFFECT_TR_WIZSPIKE);
if(self.csqcmodel_modelflags & MF_ZOMGIB)
- self.traileffect = particleeffectnum("TR_SLIGHTBLOOD");
+ self.traileffect = particleeffectnum(EFFECT_TR_SLIGHTBLOOD);
if(self.csqcmodel_modelflags & MF_TRACER2)
- self.traileffect = particleeffectnum("TR_KNIGHTSPIKE");
+ self.traileffect = particleeffectnum(EFFECT_TR_KNIGHTSPIKE);
if(self.csqcmodel_modelflags & MF_TRACER3)
- self.traileffect = particleeffectnum("TR_VORESPIKE");
+ self.traileffect = particleeffectnum(EFFECT_TR_VORESPIKE);
if(self.drawmask)
Projectile_DrawTrail(self.origin);
{
CSQCPlayer_ModelAppearance_Apply(self.entnum == player_localnum + 1);
CSQCPlayer_LOD_Apply();
+
if(!isplayer)
{
skeleton_loadinfo(self);
bool onground = 0;
if(self == csqcplayer)
{
- if(self.pmove_flags & PMF_ONGROUND)
+ if(self.flags & FL_ONGROUND)
onground = 1;
- self.anim_prev_pmove_flags = self.pmove_flags;
- if(self.pmove_flags & PMF_DUCKED)
+ self.anim_prev_pmove_flags = self.flags;
+ if(self.flags & FL_DUCKED)
animdecide_setstate(self, self.anim_state | ANIMSTATE_DUCK, false);
else if(self.anim_state & ANIMSTATE_DUCK)
animdecide_setstate(self, self.anim_state - ANIMSTATE_DUCK, false);
void CSQCModel_Hook_PostUpdate(bool isnew, bool isplayer, bool islocalplayer)
{
// is it a player model? (shared state)
- self.isplayermodel = (substring(self.model, 0, 14) == "models/player/" || substring(self.model, 0, 17) == "models/ok_player/");
+ self.isplayermodel = (substring(self.model, 0, 14) == "models/player/" || substring(self.model, 0, 17) == "models/ok_player/" || (substring(self.model, 0, 16) == "models/monsters/" && (self.entnum >= 1 && self.entnum <= maxclients)));
// save values set by server
if(self.isplayermodel)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff