From: Mario Date: Sat, 9 Nov 2013 12:41:18 +0000 (+1100) Subject: Use WriteShort for mins/maxs linking X-Git-Tag: xonotic-v0.8.0~257^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f687845d035109d484d564e6e58730f8bb3abc59;p=xonotic%2Fxonotic-data.pk3dir.git Use WriteShort for mins/maxs linking --- diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc index d5035716e..b194752bd 100644 --- a/qcsrc/csqcmodellib/cl_model.qc +++ b/qcsrc/csqcmodellib/cl_model.qc @@ -237,9 +237,9 @@ void CSQCModel_Read(float isnew) if(sf & CSQCMODEL_PROPERTY_MODELINDEX) { - //vector oldmins = self.mins, oldmaxs = self.maxs; + vector pmin = self.mins, pmax = self.maxs; setmodelindex(self, self.modelindex); // this retrieves the .model key and sets mins/maxs/absmin/absmax - //setsize(self, oldmins, oldmaxs); + setsize(self, pmin, pmax); } if(sf & CSQCMODEL_PROPERTY_TELEPORTED) diff --git a/qcsrc/csqcmodellib/common.qh b/qcsrc/csqcmodellib/common.qh index 5d5055962..4cf60174d 100644 --- a/qcsrc/csqcmodellib/common.qh +++ b/qcsrc/csqcmodellib/common.qh @@ -66,12 +66,12 @@ IN THE SOFTWARE.\ CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_ORIGIN, float, ReadCoord, WriteCoord, origin_x) \ CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_ORIGIN, float, ReadCoord, WriteCoord, origin_y) \ CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_ORIGIN, float, ReadCoord, WriteCoord, origin_z) \ - CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadChar, WriteChar, mins_x) \ - CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadChar, WriteChar, mins_y) \ - CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadChar, WriteChar, mins_z) \ - CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadChar, WriteChar, maxs_x) \ - CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadChar, WriteChar, maxs_y) \ - CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadChar, WriteChar, maxs_z) \ + CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadShort, WriteShort, mins_x) \ + CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadShort, WriteShort, mins_y) \ + CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadShort, WriteShort, mins_z) \ + CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadShort, WriteShort, maxs_x) \ + CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadShort, WriteShort, maxs_y) \ + CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_SIZE, float, ReadShort, WriteShort, maxs_z) \ CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_PITCHROLL, float, ReadAngle, WriteAngle, angles_x) \ CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_YAW, float, ReadAngle, WriteAngle, angles_y) \ CSQCMODEL_PROPERTY(CSQCMODEL_PROPERTY_PITCHROLL, float, ReadAngle, WriteAngle, angles_z) \