diff --git a/codemp/game/bg_misc.c b/codemp/game/bg_misc.c index ea9060cb18..a65756c548 100644 --- a/codemp/game/bg_misc.c +++ b/codemp/game/bg_misc.c @@ -2840,11 +2840,11 @@ void BG_TouchTriggerNewPush(entityState_t* trigger, playerState_t* player, qboo #endif if (spawnFlags & 1) { - if ((!g_fixSlidePhysics_value && abs(playerLastVelocity[0]) > 350) || (g_fixSlidePhysics_value && abs(playerLastVelocity) > 90)) + if ((!g_fixSlidePhysics_value && fabsf(playerLastVelocity[0]) > 350) || (g_fixSlidePhysics_value && fabsf(playerLastVelocity[0]) > 90)) player->velocity[0] = playerLastVelocity[0] * scale;//XVel Relative Scale } if (spawnFlags & 2) { - if ((!g_fixSlidePhysics_value && abs(playerLastVelocity[1]) > 350) || (g_fixSlidePhysics_value && abs(playerLastVelocity) > 90)) + if ((!g_fixSlidePhysics_value && fabsf(playerLastVelocity[1]) > 350) || (g_fixSlidePhysics_value && fabsf(playerLastVelocity[1]) > 90)) player->velocity[1] = playerLastVelocity[1] * scale;//YVel Relative Scale } if (spawnFlags & 4) { diff --git a/codemp/game/g_trigger.c b/codemp/game/g_trigger.c index 7cd50b0b92..ca4552242c 100644 --- a/codemp/game/g_trigger.c +++ b/codemp/game/g_trigger.c @@ -2037,8 +2037,6 @@ void Use_target_restrict_off( gentity_t *trigger, gentity_t *other, gentity_t *p } void NewPush(gentity_t *trigger, gentity_t *player, trace_t *trace) {//JAPRO Timers - float scale; - if (!player->client) return; BG_TouchTriggerNewPush(&trigger->s,&player->client->ps, player->s.eType == ET_NPC, player->client->sess.raceMode, &player->client->lastBounceTime,level.time,g_fixSlidePhysics.integer, player->client->lastVelocity);