teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-14 16:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Several Fixes

Browse source 
- Fix issue with crosshair  not showing in readneck rampage
- Fix issue with off-hand direction stopping movement
- Fix RR worldscale
This commit is contained in:
Simon 2023-02-18 17:08:36 +00:00
parent 8ad59c7e43
commit 74c7a65842
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/common/rendering/hwrenderer/data/hw_vrmodes.cpp
View file

@ -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;
}

2
source/core/version.h
View file

@ -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

2
source/games/duke/src/player_r.cpp
View file

@ -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);
}
}
}