From f587b1d399c4fe321c04f149faed9376dde9c8dd Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 15 Nov 2011 10:05:49 +0100
Subject: [PATCH] singular...

---
 .../{csqcmodels_hooks.qc => csqcmodel_hooks.qc}    |  2 +-
 qcsrc/csqcmodel/cl_model.qc                        | 14 +++++++-------
 qcsrc/csqcmodel/common.qc                          |  4 ++--
 qcsrc/csqcmodel/settings.qh                        | 14 +++++++-------
 4 files changed, 17 insertions(+), 17 deletions(-)
 rename qcsrc/client/{csqcmodels_hooks.qc => csqcmodel_hooks.qc} (98%)

diff --git a/qcsrc/client/csqcmodels_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
similarity index 98%
rename from qcsrc/client/csqcmodels_hooks.qc
rename to qcsrc/client/csqcmodel_hooks.qc
index 8f471e826..481fc2480 100644
--- a/qcsrc/client/csqcmodels_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -3,7 +3,7 @@
 .float lodmodelindex1;
 .float lodmodelindex2;
 
-void CSQCModels_Hook_PreDraw()
+void CSQCModel_Hook_PreDraw()
 {
 	// auto glowmod from colormap
 	self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? (self.colormap & 0xFF) : stof(getplayerkey(self.entnum - 1, "colors"))), TRUE) * 2;
diff --git a/qcsrc/csqcmodel/cl_model.qc b/qcsrc/csqcmodel/cl_model.qc
index 9039da49a..bd9dcfd19 100644
--- a/qcsrc/csqcmodel/cl_model.qc
+++ b/qcsrc/csqcmodel/cl_model.qc
@@ -32,7 +32,7 @@ var float autocvar_cl_nolerp = 0;
 
 void CSQCModel_InterpolateAnimation_PreNote(float sf)
 {
-#ifdef CSQCMODELS_HAVE_TWO_FRAMES
+#ifdef CSQCMODEL_HAVE_TWO_FRAMES
 	if(sf & PROPERTY_FRAME)
 	{
 		self.frame3 = self.frame;
@@ -60,7 +60,7 @@ void CSQCModel_InterpolateAnimation_PreNote(float sf)
 
 void CSQCModel_InterpolateAnimation_Note(float sf)
 {
-#ifdef CSQCMODELS_HAVE_TWO_FRAMES
+#ifdef CSQCMODEL_HAVE_TWO_FRAMES
 	if(sf & PROPERTY_FRAME)
 	{
 		self.frame1time = time;
@@ -84,7 +84,7 @@ void CSQCModel_InterpolateAnimation_Note(float sf)
 
 void CSQCModel_InterpolateAnimation_Do()
 {
-#ifdef CSQCMODELS_HAVE_TWO_FRAMES
+#ifdef CSQCMODEL_HAVE_TWO_FRAMES
 	if(autocvar_cl_nolerp || (autocvar_cl_lerpanim_maxdelta_framegroups == 0))
 	{
 		self.lerpfrac = self.csqcmodel_lerpfrac;
@@ -151,7 +151,7 @@ void CSQCModel_Draw()
 	// TODO csqcplayers: run prediction here too
 	CSQCModel_InterpolateAnimation_Do();
 
-	{ CSQCMODELS_HOOK_PREDRAW }
+	{ CSQCMODEL_HOOK_PREDRAW }
 }
 
 void CSQCModel_Read()
@@ -161,7 +161,7 @@ void CSQCModel_Read()
 
 	self.iflags |= IFLAG_ANGLES; // interpolate angles too
 
-	{ CSQCMODELS_HOOK_PREUPDATE }
+	{ CSQCMODEL_HOOK_PREUPDATE }
 
 	CSQCPlayer_PreUpdate();
 	InterpolateOrigin_Undo();
@@ -187,9 +187,9 @@ void CSQCModel_Read()
 	InterpolateOrigin_Note();
 	CSQCPlayer_PostUpdate();
 
-	{ CSQCMODELS_HOOK_POSTUPDATE }
+	{ CSQCMODEL_HOOK_POSTUPDATE }
 
-#ifdef CSQCMODELS_SUPPORT_GETTAGINFO_BEFORE_DRAW
+#ifdef CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW
 	InterpolateOrigin_Do();
 	CSQCModel_InterpolateAnimation_Do();
 #endif
diff --git a/qcsrc/csqcmodel/common.qc b/qcsrc/csqcmodel/common.qc
index a0a9cbfd7..036e09c0e 100644
--- a/qcsrc/csqcmodel/common.qc
+++ b/qcsrc/csqcmodel/common.qc
@@ -24,9 +24,9 @@
 	PROPERTY(PROPERTY_PITCHROLL, ReadAngle, WriteAngle, angles_x) \
 	PROPERTY(PROPERTY_YAW, ReadAngle, WriteAngle, angles_y) \
 	PROPERTY(PROPERTY_PITCHROLL, ReadAngle, WriteAngle, angles_z) \
-	CSQCMODELS_EXTRAPROPERTIES
+	CSQCMODEL_EXTRAPROPERTIES
 
-#ifdef CSQCMODELS_HAVE_TWO_FRAMES
+#ifdef CSQCMODEL_HAVE_TWO_FRAMES
 .float frame3;
 .float frame3time;
 .float lerpfrac3;
diff --git a/qcsrc/csqcmodel/settings.qh b/qcsrc/csqcmodel/settings.qh
index e0d173e12..bef9fcc78 100644
--- a/qcsrc/csqcmodel/settings.qh
+++ b/qcsrc/csqcmodel/settings.qh
@@ -1,21 +1,21 @@
 // define this if svqc code wants to use .frame2 and .lerpfrac
-#define CSQCMODELS_HAVE_TWO_FRAMES
+#define CSQCMODEL_HAVE_TWO_FRAMES
 
 // don't define this ever
-//#define CSQCMODELS_SUPPORT_GETTAGINFO_BEFORE_DRAW
+//#define CSQCMODEL_SUPPORT_GETTAGINFO_BEFORE_DRAW
 
 // add properties you want networked to CSQC here
-#define CSQCMODELS_EXTRAPROPERTIES \
+#define CSQCMODEL_EXTRAPROPERTIES \
 	PROPERTY(1, ReadByte, WriteByte, skin) \
 	PROPERTY(2, ReadShort, WriteShort, colormap) \
 	PROPERTY(4, ReadInt24_t, WriteInt24_t, effects) \
 	PROPERTY_SCALED(8, ReadByte, WriteByte, alpha, 255, 0, 255)
 
 // add hook function calls here
-#define CSQCMODELS_HOOK_PREUPDATE
-#define CSQCMODELS_HOOK_POSTUPDATE
-#define CSQCMODELS_HOOK_PREDRAW \
-	CSQCModels_Hook_PreDraw();
+#define CSQCMODEL_HOOK_PREUPDATE
+#define CSQCMODEL_HOOK_POSTUPDATE
+#define CSQCMODEL_HOOK_PREDRAW \
+	CSQCModel_Hook_PreDraw();
 #define CSQCPLAYER_HOOK_POSTCAMERASETUP
 
 // mod must define:
-- 
2.39.2