restructure a bit :)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / csqcmodel / cl_model.qc

diff --git a/qcsrc/csqcmodel/cl_model.qc b/qcsrc/csqcmodel/cl_model.qc
index ad582543c7fb8476a3c516b47caf21a14048c748..f1607c08d96f915ac5a8eac0e14af15180d0fc52 100644 (file)
--- a/qcsrc/csqcmodel/cl_model.qc
+++ b/qcsrc/csqcmodel/cl_model.qc
@@ -158,6 +158,11 @@ void CSQCModel_Read()
        float sf;
        sf = ReadShort();
 
+       // some nice flags for CSQCMODEL_IF and the hooks
+       float isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
+       float islocalplayer = (self.entnum == player_localentnum);
+       float isnolocalplayer = (isplayer && (self.entnum != player_localentnum));
+
        self.iflags |= IFLAG_ANGLES; // interpolate angles too
 
        { CSQCMODEL_HOOK_PREUPDATE }
@@ -166,15 +171,19 @@ void CSQCModel_Read()
        InterpolateOrigin_Undo();
        CSQCModel_InterpolateAnimation_PreNote(sf);
 
-#define CSQCMODEL_PROPERTY(flag,r,w,f) \
+#define CSQCMODEL_IF(cond) if(cond) {
+#define CSQCMODEL_ENDIF }
+#define CSQCMODEL_PROPERTY(flag,t,r,w,f) \
        if(sf & flag) \
                self.f = r();
-#define CSQCMODEL_PROPERTY_SCALED(flag,r,w,f,s,mi,ma) \
+#define CSQCMODEL_PROPERTY_SCALED(flag,t,r,w,f,s,mi,ma) \
        if(sf & flag) \
                self.f = r() / s;
        ALLPROPERTIES
 #undef CSQCMODEL_PROPERTY_SCALED
 #undef CSQCMODEL_PROPERTY
+#undef CSQCMODEL_ENDIF
+#undef CSQCMODEL_IF
 
        if(sf & CSQCMODEL_PROPERTY_MODELINDEX)
                setmodelindex(self, self.modelindex); // this retrieves the .model key and sets mins/maxs/absmin/absmax