From efe14f5b34aa59b5d5eff7b0ae35eb69d4c3eacf Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 6 Jan 2016 15:11:35 +1000 Subject: [PATCH] Remove the CSQC model hook macros (we use a parameter in them now that may cause issues) --- qcsrc/common/csqcmodel_settings.qh | 6 ------ qcsrc/lib/csqcmodel/cl_model.qc | 6 +++--- qcsrc/lib/csqcmodel/settings.qh | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh index 916fd88bc..da2661b9c 100644 --- a/qcsrc/common/csqcmodel_settings.qh +++ b/qcsrc/common/csqcmodel_settings.qh @@ -72,12 +72,6 @@ // TODO get rid of colormod/glowmod here, find good solution for vortex charge glowmod hack; also get rid of some useless properties on non-players that only exist for CopyBody // add hook function calls here -#define CSQCMODEL_HOOK_PREUPDATE \ - CSQCModel_Hook_PreUpdate(this, isnew, isplayer, islocalplayer); -#define CSQCMODEL_HOOK_POSTUPDATE \ - CSQCModel_Hook_PostUpdate(this, isnew, isplayer, islocalplayer); -#define CSQCMODEL_HOOK_PREDRAW \ - CSQCModel_Hook_PreDraw(this, isplayer); #define CSQCPLAYER_HOOK_POSTCAMERASETUP() \ CSQCPlayer_SetViewLocation() diff --git a/qcsrc/lib/csqcmodel/cl_model.qc b/qcsrc/lib/csqcmodel/cl_model.qc index 53b58e629..614e0d037 100644 --- a/qcsrc/lib/csqcmodel/cl_model.qc +++ b/qcsrc/lib/csqcmodel/cl_model.qc @@ -192,7 +192,7 @@ void CSQCModel_Draw(entity this) CSQCModel_InterpolateAnimation_Do(this); - { CSQCMODEL_HOOK_PREDRAW } + CSQCModel_Hook_PreDraw(this, isplayer); // inherit draw flags easily entity root = this; @@ -234,7 +234,7 @@ NET_HANDLE(ENT_CLIENT_MODEL, bool isnew) this.iflags |= IFLAG_ANGLES; // interpolate angles too this.iflags |= IFLAG_VELOCITY | IFLAG_AUTOVELOCITY; // let's calculate velocity automatically - { CSQCMODEL_HOOK_PREUPDATE } + CSQCModel_Hook_PreUpdate(this, isnew, isplayer, islocalplayer); CSQCPlayer_PreUpdate(this); InterpolateOrigin_Undo(this); @@ -271,7 +271,7 @@ NET_HANDLE(ENT_CLIENT_MODEL, bool isnew) InterpolateOrigin_Note(this); CSQCPlayer_PostUpdate(this); - { CSQCMODEL_HOOK_POSTUPDATE } + CSQCModel_Hook_PostUpdate(this, isnew, isplayer, islocalplayer); #ifdef CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW InterpolateOrigin_Do(this); diff --git a/qcsrc/lib/csqcmodel/settings.qh b/qcsrc/lib/csqcmodel/settings.qh index b365d2626..85b8a4fcb 100644 --- a/qcsrc/lib/csqcmodel/settings.qh +++ b/qcsrc/lib/csqcmodel/settings.qh @@ -12,9 +12,6 @@ /* CSQCMODEL_PROPERTY(2, float, ReadInt24_t, WriteInt24_t, effects) */ // add hook function calls here -#define CSQCMODEL_HOOK_PREUPDATE -#define CSQCMODEL_HOOK_POSTUPDATE -#define CSQCMODEL_HOOK_PREDRAW #define CSQCPLAYER_HOOK_POSTCAMERASETUP // force updates of player entities this frequently (per second) even if unchanged -- 2.39.2