spawnflags 256 + 4 on newpush for absolute z vel

TomArrow · Jan 3, 2024 · 15b779d · 15b779d
1 parent a66aa79
commit 15b779d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/codemp/game/bg_pmove.c b/codemp/game/bg_pmove.c
@@ -10298,7 +10298,7 @@ void BG_AdjustClientSpeed(playerState_t *ps, usercmd_t *cmd, int svTime)
 #else
 		if (!(cgs.jcinfo & JAPRO_CINFO_ROLLCANCEL) || pm->ps->stats[STAT_RACEMODE])
 #endif
-			if (ps->stats[STAT_MOVEMENTSTYLE] != MV_OCPM)
+			if (ps->stats[STAT_MOVEMENTSTYLE] != MV_OCPM && ps->stats[STAT_MOVEMENTSTYLE] != MV_TRIBES)
 				ps->speed *= 0.75f; //JK2 1.02 doesn't have this? does q3 / wsw?
 	}
 

diff --git a/codemp/game/g_trigger.c b/codemp/game/g_trigger.c
@@ -2140,7 +2140,10 @@ void NewPush(gentity_t *trigger, gentity_t *player, trace_t *trace) {//JAPRO Tim
 			player->client->ps.velocity[1] = player->client->lastVelocity[1] * scale;//YVel Relative Scale
 	}
 	if (trigger->spawnflags & 4) {
-		player->client->ps.velocity[2] = player->client->lastVelocity[2] * scale;//ZVel Relative Scale
+		if (trigger->spawnflags & 256)
+			player->client->ps.velocity[2] = scale;//ZVel absolute
+		else
+			player->client->ps.velocity[2] = player->client->lastVelocity[2] * scale;//ZVel Relative Scale
 	}
 }