support negative alpha

diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh
index 0f3ca3859ad6b6274f032358d06d07e27fb0869f..e0dfce4ca34d0ec2a3623d5f9b0ecc35eed9ff46 100644 (file)
--- a/qcsrc/common/csqcmodel_settings.qh
+++ b/qcsrc/common/csqcmodel_settings.qh
@@ -19,7 +19,7 @@
        CSQCMODEL_PROPERTY(1, float, ReadShort, WriteShort, colormap) \
        CSQCMODEL_PROPERTY(2, float, ReadInt24_t, WriteInt24_t, effects) \
        CSQCMODEL_PROPERTY(4, float, ReadByte, WriteByte, modelflags) \
-       CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 255, 0, 255) \
+       CSQCMODEL_PROPERTY_SCALED(8, float, ReadByte, WriteByte, alpha, 254, -1, 254) \
        CSQCMODEL_PROPERTY(16, float, ReadByte, WriteByte, skin) \
        CSQCMODEL_IF(isplayer) \
        CSQCMODEL_ENDIF \

diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc
index 24f3c60e09f25ef6b341048464033c6cb254a705..b77507bb653a53d9eb1253ceec1ac60cb3c78c91 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -195,7 +195,7 @@ void CSQCModel_Read(float isnew)
                self.f = r();
 #define CSQCMODEL_PROPERTY_SCALED(flag,t,r,w,f,s,mi,ma) \
        if(sf & flag) \
-               self.f = r() / s;
+               self.f = (r() + mi) / s;
        ALLPROPERTIES
 #undef CSQCMODEL_PROPERTY_SCALED
 #undef CSQCMODEL_PROPERTY

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index 3646370cecbbbbdab491c4fc9afc86cc9701f500..bf6eefa6971b0b0c3f9687c61e60608e9e13ff3d 100644 (file)
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -92,7 +92,7 @@ void CSQCModel_CheckUpdate()
        }
 #define CSQCMODEL_PROPERTY_SCALED(flag,t,r,w,f,s,mi,ma) \
        { \
-               t tmp = bound(mi, s * self.f, ma); \
+               t tmp = bound(mi, s * self.f, ma) - mi; \
                if(tmp != self.csqcmodel_##f) \
                { \
                        self.csqcmodel_##f = tmp; \