X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=6e7e5a8de77444946bec59756357d218a838975c;hp=c3e81478c4f2819c9fe9999a4ad715906e3fcd07;hb=21307f327df5609b82d90496c1c6156d636d1c8d;hpb=e4ac65ac2e770b795d1234ead3b2c25731f39bb3

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index c3e81478c..6e7e5a8de 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,23 +1,12 @@
-#include "csqcmodel_hooks.qh"
-#include "_all.qh"
-
-#include "gibs.qh"
+#include "mutators/events.qh"
 #include "player_skeleton.qh"
-
 #include "weapons/projectile.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 "mutators/events.qh"
-
-#include "../csqcmodellib/cl_model.qh"
-#include "../csqcmodellib/cl_player.qh"
-#include "../csqcmodellib/interpolate.qh"
-
+#include "../common/movetypes/movetypes.qh"
+#include "../common/viewloc.qh"
+#include "../lib/csqcmodel/cl_model.qh"
+#include "../lib/csqcmodel/cl_player.qh"
+#include "../lib/csqcmodel/interpolate.qh"
 
 .float death_time;
 .int modelflags;
@@ -31,7 +20,7 @@ void CSQCModel_Hook_PreDraw(bool isplayer);
 .int lodmodelindex1;
 .int lodmodelindex2;
 void CSQCPlayer_LOD_Apply(void)
-{
+{SELFPARAM();
 	// LOD model loading
 	if(self.lodmodelindex0 != self.modelindex)
 	{
@@ -51,7 +40,7 @@ void CSQCPlayer_LOD_Apply(void)
 		if(fexists(s))
 		{
 			precache_model(s);
-			setmodel(self, s);
+			_setmodel(self, s);
 			if(self.modelindex)
 				self.lodmodelindex1 = self.modelindex;
 		}
@@ -60,12 +49,12 @@ void CSQCPlayer_LOD_Apply(void)
 		if(fexists(s))
 		{
 			precache_model(s);
-			setmodel(self, s);
+			_setmodel(self, s);
 			if(self.modelindex)
 				self.lodmodelindex2 = self.modelindex;
 		}
 
-		setmodel(self, modelname); // make everything normal again
+		_setmodel(self, modelname); // make everything normal again
 		setsize(self, mi, ma);
 	}
 
@@ -120,14 +109,14 @@ int forceplayermodels_goodmodelindex;
 .vector old_glowmod;
 
 void CSQCPlayer_ModelAppearance_PreUpdate(void)
-{
+{SELFPARAM();
 	self.model = self.forceplayermodels_savemodel;
 	self.modelindex = self.forceplayermodels_savemodelindex;
 	self.skin = self.forceplayermodels_saveskin;
 	self.colormap = self.forceplayermodels_savecolormap;
 }
 void CSQCPlayer_ModelAppearance_PostUpdate(void)
-{
+{SELFPARAM();
 	self.forceplayermodels_savemodel = self.model;
 	self.forceplayermodels_savemodelindex = self.modelindex;
 	self.forceplayermodels_saveskin = self.skin;
@@ -142,7 +131,7 @@ void CSQCPlayer_ModelAppearance_PostUpdate(void)
 	}
 }
 void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
-{
+{SELFPARAM();
 	// FORCEMODEL
 	// which one is ALWAYS good?
 	if (!forceplayermodels_goodmodel)
@@ -150,7 +139,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
 		entity e;
 		e = spawn();
 		precache_model(cvar_defstring("_cl_playermodel"));
-		setmodel(e, cvar_defstring("_cl_playermodel"));
+		_setmodel(e, cvar_defstring("_cl_playermodel"));
 		forceplayermodels_goodmodel = e.model;
 		forceplayermodels_goodmodelindex = e.modelindex;
 		remove(e);
@@ -181,7 +170,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
 		// only if this failed, find it out on our own
 		entity e;
 		e = spawn();
-		setmodel(e, autocvar__cl_playermodel); // this is harmless, see below
+		_setmodel(e, autocvar__cl_playermodel); // this is harmless, see below
 		forceplayermodels_modelisgoodmodel = fexists(e.model);
 		forceplayermodels_model = e.model;
 		forceplayermodels_modelindex = e.modelindex;
@@ -193,7 +182,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
 	{
 		entity e;
 		e = spawn();
-		setmodel(e, autocvar_cl_forcemyplayermodel); // this is harmless, see below
+		_setmodel(e, autocvar_cl_forcemyplayermodel); // this is harmless, see below
 		forceplayermodels_myisgoodmodel = fexists(e.model);
 		forceplayermodels_mymodel = e.model;
 		forceplayermodels_mymodelindex = e.modelindex;
@@ -325,7 +314,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
 
 #define IS_DEAD_FRAME(f) ((f) == 0 || (f) == 1)
 void CSQCPlayer_FallbackFrame_PreUpdate(void)
-{
+{SELFPARAM();
 	self.frame = self.csqcmodel_saveframe;
 	self.frame2 = self.csqcmodel_saveframe2;
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
@@ -334,7 +323,7 @@ void CSQCPlayer_FallbackFrame_PreUpdate(void)
 #endif
 }
 void CSQCPlayer_FallbackFrame_PostUpdate(bool isnew)
-{
+{SELFPARAM();
 	self.csqcmodel_saveframe = self.frame;
 	self.csqcmodel_saveframe2 = self.frame2;
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
@@ -360,11 +349,11 @@ void CSQCPlayer_FallbackFrame_PostUpdate(bool isnew)
 	self.csqcmodel_isdead = IS_DEAD_FRAME(self.frame);
 }
 void CSQCPlayer_AnimDecide_PostUpdate(bool isnew)
-{
+{SELFPARAM();
 	self.csqcmodel_isdead = !!(self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2));
 }
 int CSQCPlayer_FallbackFrame(int f)
-{
+{SELFPARAM();
 	if(frameduration(self.modelindex, f) > 0)
 		return f; // goooooood
 	if(frameduration(self.modelindex, 1) <= 0)
@@ -384,7 +373,7 @@ int CSQCPlayer_FallbackFrame(int f)
 	return f;
 }
 void CSQCPlayer_FallbackFrame_Apply(void)
-{
+{SELFPARAM();
 	self.frame = CSQCPlayer_FallbackFrame(self.frame);
 	self.frame2 = CSQCPlayer_FallbackFrame(self.frame2);
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
@@ -398,15 +387,11 @@ void CSQCPlayer_FallbackFrame_Apply(void)
 .int tag_entity_lastmodelindex;
 .int tag_index;
 void CSQCModel_AutoTagIndex_Apply(void)
-{
+{SELFPARAM();
 	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);
+	viewloc_SetTags();
 
 	MUTATOR_CALLHOOK(TagIndex_Update, self);
 
@@ -423,10 +408,7 @@ void CSQCModel_AutoTagIndex_Apply(void)
 		// recursive predraw call to fix issues with forcemodels and LOD if bone indexes mismatch
 		if(self.tag_entity.classname == "csqcmodel")
 		{
-			entity oldself = self;
-			self = self.tag_entity;
-			CSQCModel_Hook_PreDraw((self.entnum >= 1 && self.entnum <= maxclients));
-			self = oldself;
+			WITH(entity, self, self.tag_entity, CSQCModel_Hook_PreDraw((self.entnum >= 1 && self.entnum <= maxclients)));
 		}
 
 		if(self.tag_entity.modelindex != self.tag_entity_lastmodelindex)
@@ -498,14 +480,16 @@ const int MF_TRACER2 =  64; // orange split trail
 const int MF_TRACER3 = 128; // purple trail
 .int csqcmodel_effects;
 .int csqcmodel_modelflags;
+.int csqcmodel_traileffect;
 void CSQCModel_Effects_PreUpdate(void)
-{
+{SELFPARAM();
 	self.effects = self.csqcmodel_effects;
 	self.modelflags = self.csqcmodel_modelflags;
+	self.traileffect = self.csqcmodel_traileffect;
 }
 void Reset_ArcBeam(void);
 void CSQCModel_Effects_PostUpdate(void)
-{
+{SELFPARAM();
 	if (self == csqcplayer) {
 		if (self.csqcmodel_teleported) {
 			Reset_ArcBeam();
@@ -513,22 +497,24 @@ void CSQCModel_Effects_PostUpdate(void)
 	}
 	self.csqcmodel_effects = self.effects;
 	self.csqcmodel_modelflags = self.modelflags;
+	self.csqcmodel_traileffect = self.traileffect;
 	self.effects = 0;
 	self.modelflags = 0;
 	if(self.csqcmodel_teleported)
-		Projectile_ResetTrail(self.origin);
+		Projectile_ResetTrail(self, self.origin);
 }
 .int snd_looping;
 void CSQCModel_Effects_Apply(void)
-{
+{SELFPARAM();
 	int eff = self.csqcmodel_effects & ~CSQCMODEL_EF_RESPAWNGHOST;
+	int tref = self.csqcmodel_traileffect;
 
 	self.renderflags &= ~(RF_DEPTHHACK | RF_ADDITIVE | RF_FULLBRIGHT | EF_NOSHADOW | RF_USEAXIS);
 	self.effects = 0;
 	self.traileffect = 0;
 
 	if(eff & EF_BRIGHTFIELD)
-		self.traileffect = particleeffectnum(EFFECT_TR_NEXUIZPLASMA);
+		tref = EFFECT_TR_NEXUIZPLASMA.m_id;
 	// ignoring EF_MUZZLEFLASH
 	if(eff & EF_BRIGHTLIGHT)
 		adddynamiclight(self.origin, 400, '3 3 3');
@@ -562,29 +548,31 @@ void CSQCModel_Effects_Apply(void)
 		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(EFFECT_TR_ROCKET);
+		tref = EFFECT_TR_ROCKET.m_id;
 	if(self.csqcmodel_modelflags & MF_GRENADE)
-		self.traileffect = particleeffectnum(EFFECT_TR_GRENADE);
+		tref = EFFECT_TR_GRENADE.m_id;
 	if(self.csqcmodel_modelflags & MF_GIB)
-		self.traileffect = particleeffectnum(EFFECT_TR_BLOOD);
+		tref = EFFECT_TR_BLOOD.m_id;
 	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(EFFECT_TR_WIZSPIKE);
+		tref = EFFECT_TR_WIZSPIKE.m_id;
 	if(self.csqcmodel_modelflags & MF_ZOMGIB)
-		self.traileffect = particleeffectnum(EFFECT_TR_SLIGHTBLOOD);
+		tref = EFFECT_TR_SLIGHTBLOOD.m_id;
 	if(self.csqcmodel_modelflags & MF_TRACER2)
-		self.traileffect = particleeffectnum(EFFECT_TR_KNIGHTSPIKE);
+		tref = EFFECT_TR_KNIGHTSPIKE.m_id;
 	if(self.csqcmodel_modelflags & MF_TRACER3)
-		self.traileffect = particleeffectnum(EFFECT_TR_VORESPIKE);
+		tref = EFFECT_TR_VORESPIKE.m_id;
+
+	self.traileffect = tref;
 
 	if(self.drawmask)
-		Projectile_DrawTrail(self.origin);
+		Projectile_DrawTrail(self, self.origin);
 	else
-		Projectile_ResetTrail(self.origin);
+		Projectile_ResetTrail(self, self.origin);
 
 	if(self.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST)
 		self.renderflags |= RF_ADDITIVE;
@@ -594,7 +582,7 @@ void CSQCModel_Effects_Apply(void)
 	{
 		if(!self.snd_looping)
 		{
-			sound(self, CH_TRIGGER_SINGLE, "misc/jetpack_fly.wav", VOL_BASE, autocvar_g_jetpack_attenuation);
+			sound(self, CH_TRIGGER_SINGLE, SND_JETPACK_FLY, VOL_BASE, autocvar_g_jetpack_attenuation);
 			self.snd_looping = CH_TRIGGER_SINGLE;
 		}
 	}
@@ -602,17 +590,12 @@ void CSQCModel_Effects_Apply(void)
 	{
 		if(self.snd_looping)
 		{
-			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;
 		}
 	}
 }
 
-void CSQCPlayer_Precache()
-{
-	precache_sound("misc/jetpack_fly.wav");
-}
-
 // general functions
 .int csqcmodel_predraw_run;
 .int anim_frame;
@@ -625,7 +608,7 @@ void CSQCPlayer_Precache()
 .int anim_saveframe2time;
 .int anim_prev_pmove_flags;
 void CSQCModel_Hook_PreDraw(bool isplayer)
-{
+{SELFPARAM();
 	if(self.csqcmodel_predraw_run == framecount)
 		return;
 	self.csqcmodel_predraw_run = framecount;
@@ -642,6 +625,7 @@ void CSQCModel_Hook_PreDraw(bool isplayer)
 	{
 		CSQCPlayer_ModelAppearance_Apply(self.entnum == player_localnum + 1);
 		CSQCPlayer_LOD_Apply();
+
 		if(!isplayer)
 		{
 			skeleton_loadinfo(self);
@@ -723,7 +707,7 @@ void CSQCModel_Hook_PreDraw(bool isplayer)
 }
 
 void CSQCModel_Hook_PreUpdate(bool isnew, bool isplayer, bool islocalplayer)
-{
+{SELFPARAM();
 	// interpolate v_angle
 	self.iflags |= IFLAG_V_ANGLE_X;
 	// revert to values from server
@@ -737,9 +721,9 @@ void CSQCModel_Hook_PreUpdate(bool isnew, bool isplayer, bool islocalplayer)
 }
 
 void CSQCModel_Hook_PostUpdate(bool isnew, bool isplayer, bool islocalplayer)
-{
+{SELFPARAM();
 	// 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)