]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
CSQCmodel LOD: don't screw up mins/maxs ;)
authorRudolf Polzer <divverent@alientrap.org>
Tue, 3 Apr 2012 09:34:07 +0000 (11:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Apr 2012 09:34:07 +0000 (11:34 +0200)
qcsrc/client/csqcmodel_hooks.qc
qcsrc/csqcmodellib/cl_model.qc

index b93bca47fea1b30716a74ea21fffcdf9cc30b0da..152ecbe82e998e398d35fcd0a8a1f0cbc37a811b 100644 (file)
@@ -14,6 +14,9 @@ void CSQCPlayer_LOD_Apply(void)
                string modelname = self.model;
                string s;
 
+               vector mi = self.mins;
+               vector ma = self.maxs;
+
                // set modelindex
                self.lodmodelindex0 = self.modelindex;
                self.lodmodelindex1 = self.modelindex;
@@ -39,6 +42,7 @@ void CSQCPlayer_LOD_Apply(void)
                }
 
                setmodel(self, modelname); // make everything normal again
+               setsize(self, mi, ma);
        }
 
        // apply LOD
index 3b54263f712370591316b83e902feb57752f305c..163a5126d3be8f34b5e96289d61740c42c2eae0d 100644 (file)
@@ -208,6 +208,7 @@ void CSQCModel_Read(float isnew)
 
        if(sf & CSQCMODEL_PROPERTY_MODELINDEX)
                setmodelindex(self, self.modelindex); // this retrieves the .model key and sets mins/maxs/absmin/absmax
+               // FIXME do we WANT this to override mins/maxs?
 
        if(sf & CSQCMODEL_PROPERTY_TELEPORTED)
        {