X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=8a2fe9ef3334faf5d067d2ca101ee235428f62df;hb=bb450e879647c09efd145e95637ee17508d1d1cb;hp=befdb9bcc437e552e423d8489ac81f14cfec7d26;hpb=5bf53ba7af3a48304314d60bc3a4389c9f1d6586;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index befdb9bcc..8a2fe9ef3 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -22,17 +22,17 @@ void g_clientmodel_setcolormaptoactivator (void) void g_model_dropbyspawnflags() { - if(self.spawnflags & 3 == 1) // ALIGN_ORIGIN + if((self.spawnflags & 3) == 1) // ALIGN_ORIGIN { traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); setorigin(self, trace_endpos); } - else if(self.spawnflags & 3 == 2) // ALIGN_BOTTOM + else if((self.spawnflags & 3) == 2) // ALIGN_BOTTOM { tracebox(self.origin, self.mins, self.maxs, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); setorigin(self, trace_endpos); } - else if(self.spawnflags & 3 == 3) // ALIGN_ORIGIN | ALIGN_BOTTOM + else if((self.spawnflags & 3) == 3) // ALIGN_ORIGIN | ALIGN_BOTTOM { traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); setorigin(self, trace_endpos - '0 0 1' * self.mins_z); @@ -59,7 +59,7 @@ float g_clientmodel_genericsendentity (entity to, float sf) sf |= 0x40; if(self.lodmodelindex1) sf |= 0x80; - + WriteByte(MSG_ENTITY, ENT_CLIENT_WALL); WriteByte(MSG_ENTITY, sf); @@ -128,6 +128,7 @@ float g_clientmodel_genericsendentity (entity to, float sf) #define G_MODEL_INIT(sol) \ + if(self.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) self.movetype = MOVETYPE_PHYSICS; \ if(!self.scale) self.scale = self.modelscale; \ SetBrushEntityModel(); \ self.use = g_model_setcolormaptoactivator; \ @@ -135,6 +136,7 @@ float g_clientmodel_genericsendentity (entity to, float sf) if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; #define G_CLIENTMODEL_INIT(sol) \ + if(self.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) self.movetype = MOVETYPE_PHYSICS; \ if(!self.scale) self.scale = self.modelscale; \ SetBrushEntityModel(); \ self.use = g_clientmodel_setcolormaptoactivator; \