From 8060b147d06a3af26afe4939a85adf7aae486bb0 Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Wed, 27 Dec 2023 15:04:45 -0600 Subject: [PATCH] Fixed CF_SCALEDNOLERP having the wrong value. --- src/playsim/d_player.h | 2 +- wadsrc/static/zscript/constants.zs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playsim/d_player.h b/src/playsim/d_player.h index b422147b78..5b14793e7f 100644 --- a/src/playsim/d_player.h +++ b/src/playsim/d_player.h @@ -123,8 +123,8 @@ typedef enum CF_PREDICTING = 1 << 13, // [RH] Player movement is being predicted CF_INTERPVIEW = 1 << 14, // [RH] view was changed outside of input, so interpolate one frame CF_INTERPVIEWANGLES = 1 << 15, // [MR] flag for interpolating view angles without interpolating the entire frame - CF_SCALEDNOLERP = 1 << 15, // [MR] flag for applying angles changes in the ticrate without interpolating the frame CF_NOFOVINTERP = 1 << 16, // [B] Disable FOV interpolation when instantly zooming + CF_SCALEDNOLERP = 1 << 17, // [MR] flag for applying angles changes in the ticrate without interpolating the frame CF_EXTREMELYDEAD = 1 << 22, // [RH] Reliably let the status bar know about extreme deaths. CF_BUDDHA2 = 1 << 24, // [MC] Absolute buddha. No voodoo can kill it either. CF_GODMODE2 = 1 << 25, // [MC] Absolute godmode. No voodoo can kill it either. diff --git a/wadsrc/static/zscript/constants.zs b/wadsrc/static/zscript/constants.zs index e9708d9771..efbb42aa84 100644 --- a/wadsrc/static/zscript/constants.zs +++ b/wadsrc/static/zscript/constants.zs @@ -1156,8 +1156,8 @@ enum EPlayerCheats CF_PREDICTING = 1 << 13, // [RH] Player movement is being predicted CF_INTERPVIEW = 1 << 14, // [RH] view was changed outside of input, so interpolate one frame CF_INTERPVIEWANGLES = 1 << 15, // [MR] flag for interpolating view angles without interpolating the entire frame - CF_SCALEDNOLERP = 1 << 15, // [MR] flag for applying angles changes in the ticrate without interpolating the frame CF_NOFOVINTERP = 1 << 16, // [B] Disable FOV interpolation when instantly zooming + CF_SCALEDNOLERP = 1 << 17, // [MR] flag for applying angles changes in the ticrate without interpolating the frame CF_EXTREMELYDEAD = 1 << 22, // [RH] Reliably let the status bar know about extreme deaths.