X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cgame.c;h=00ca87c0bbc0d7e351943ae8dea1995678a228cc;hb=55bdf1bafcbe11965b60d505d335f95129405822;hp=1e398892f7a3fef58815d99bcaaa672e28a05696;hpb=ad2db96126e3318e9c4a99a1978cdddab51a94f6;p=xonotic%2Fdarkplaces.git diff --git a/cgame.c b/cgame.c index 1e398892..00ca87c0 100644 --- a/cgame.c +++ b/cgame.c @@ -27,8 +27,6 @@ typedef struct localentity_s float airfrictionscale; float gravityscale; void (*framethink)(struct localentity_s *e); - //int solid; - //void (*touch)(struct localentity_s *self, struct localentity_s *other); void (*touchnetwork)(struct localentity_s *self); cgdrawentity_t draw; } @@ -185,7 +183,7 @@ static void explosiondebris_framethink(localentity_t *self) { if (gametime > self->dietime) { - self->draw.scale -= frametime * 3; + self->draw.scale -= (float)(frametime * 3.0); if (self->draw.scale < 0.05f) { entremove(self); @@ -286,7 +284,7 @@ static void net_gibshower(unsigned char num) time = CGVM_Time(); // read the network data count = CGVM_MSG_ReadByte(); - velocityscale = CGVM_MSG_ReadByte() * 100; + velocityscale = (float)(CGVM_MSG_ReadByte() * 100); readvector(org); for (i = 0;i < count;i++) @@ -301,7 +299,7 @@ static void net_gibshower(unsigned char num) e->draw.angles[2] = CGVM_RandomRange(0, 360); VectorRandom(e->velocity); VectorScale(e->velocity, velocityscale, e->velocity); - e->velocity[2] -= cg_gravity * 0.1; + e->velocity[2] -= (float)(cg_gravity * 0.1); e->avelocity[0] = CGVM_RandomRange(0, 1440); e->avelocity[1] = CGVM_RandomRange(0, 1440); e->avelocity[2] = CGVM_RandomRange(0, 1440);