fix misc_gamemodel bbox when using modelscale
authorRudolf Polzer <divverent@alientrap.org>
Fri, 23 Dec 2011 22:38:55 +0000 (23:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 23 Dec 2011 22:38:55 +0000 (23:38 +0100)
qcsrc/server/g_models.qc

index 690fd75..befdb9b 100644 (file)
@@ -128,15 +128,15 @@ float g_clientmodel_genericsendentity (entity to, float sf)
 
 
 #define G_MODEL_INIT(sol) \
-       SetBrushEntityModel(); \
        if(!self.scale) self.scale = self.modelscale; \
+       SetBrushEntityModel(); \
        self.use = g_model_setcolormaptoactivator; \
        InitializeEntity(self, g_model_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
        if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT;
 
 #define G_CLIENTMODEL_INIT(sol) \
-       SetBrushEntityModel(); \
        if(!self.scale) self.scale = self.modelscale; \
+       SetBrushEntityModel(); \
        self.use = g_clientmodel_setcolormaptoactivator; \
        InitializeEntity(self, g_clientmodel_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
        if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; \