From 74c7a65842aa1e443ef97b9a757ae6656c1ed232 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 18 Feb 2023 17:08:36 +0000 Subject: [PATCH] Several Fixes - Fix issue with crosshair not showing in readneck rampage - Fix issue with off-hand direction stopping movement - Fix RR worldscale --- source/common/rendering/hwrenderer/data/hw_vrmodes.cpp | 8 ++++++-- source/core/version.h | 2 +- source/games/duke/src/player_r.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/common/rendering/hwrenderer/data/hw_vrmodes.cpp b/source/common/rendering/hwrenderer/data/hw_vrmodes.cpp index 199fe2bce..c477ce5e6 100644 --- a/source/common/rendering/hwrenderer/data/hw_vrmodes.cpp +++ b/source/common/rendering/hwrenderer/data/hw_vrmodes.cpp @@ -74,7 +74,6 @@ CVAR(Float, vr_height_adjust, 0.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) // METERS CVAR(Int, vr_control_scheme, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) CVAR(Bool, vr_move_use_offhand, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Bool, vr_teleport, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -CVAR(Float, vr_weaponRotate, -30, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Float, vr_weaponScale, 1.02f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Float, vr_snapTurn, 45.0f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Int, vr_move_speed, 19, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) @@ -142,6 +141,11 @@ inline bool isDuke() return g_gameType & (GAMEFLAG_DUKECOMPAT | GAMEFLAG_DUKEBETA | GAMEFLAG_WORLDTOUR | GAMEFLAG_DUKEDC | GAMEFLAG_DUKENW | GAMEFLAG_DUKEVACA); } +inline bool isRR() +{ + return g_gameType & (GAMEFLAG_RRALL); +} + float vr_hunits_per_meter() { if (vr_units_per_meter != 0.0) @@ -149,7 +153,7 @@ float vr_hunits_per_meter() return vr_units_per_meter; } - if (isDuke()) + if (isDuke() || isRR()) { return 24.0f; } diff --git a/source/core/version.h b/source/core/version.h index dc8904465..52ca9a416 100644 --- a/source/core/version.h +++ b/source/core/version.h @@ -44,7 +44,7 @@ const char *GetVersionString(); #define VERSIONSTR "1.7pre" -#define RAZEXR_VERSIONSTR "RazeXR 0.2.1" +#define RAZEXR_VERSIONSTR "RazeXR 0.2.2" // The version as seen in the Windows resource #define RC_FILEVERSION 1,6,9999,0 diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 8f44f8094..b9d837e6a 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -3219,7 +3219,7 @@ static void processweapon(int snum, ESyncBits actions, sectortype* psectp) } else { - CreateActor(hit.hitSector, hit.hitpos, DTILE_CROSSHAIR, -15, DVector2(0.1, 0.1), sang, 0., 0., pact, STAT_AIM_SPRITE); + CreateActor(hit.hitSector, hit.hitpos, RTILE_CROSSHAIR, -15, DVector2(0.1, 0.1), sang, 0., 0., pact, STAT_AIM_SPRITE); } } }