teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-30 16:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing melee icon in JKO

Browse source 
and don't draw crosshair when melee active
This commit is contained in:
Simon 2023-06-01 23:04:31 +01:00
parent 468e7b23a1
commit 9efd9ed081
4 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_draw.cpp
View file

@ -1894,6 +1894,7 @@ static void CG_DrawCrosshair3D(int type) // 0 - force, 1 - weapons
} }
if ( type == 1 && (cg.snap->ps.weapon == WP_NONE || if ( type == 1 && (cg.snap->ps.weapon == WP_NONE ||
cg.snap->ps.weapon == WP_MELEE ||
cg.snap->ps.weapon == WP_SABER || cg.snap->ps.weapon == WP_SABER ||
cg.snap->ps.weapon == WP_STUN_BATON || cg.snap->ps.weapon == WP_STUN_BATON ||
cg.snap->ps.weapon == WP_THERMAL )) cg.snap->ps.weapon == WP_THERMAL ))

6
Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp
View file

@ -116,6 +116,12 @@ void CG_RegisterWeapon( int weaponNum ) {
weaponInfo->weaponMidpoint[i] = mins[i] + 0.5 * ( maxs[i] - mins[i] ); weaponInfo->weaponMidpoint[i] = mins[i] + 0.5 * ( maxs[i] - mins[i] );
} }
//Bit of a hack - default weapons.dat on JK2 is missing the melee icon!
if (weaponNum == WP_MELEE)
{
strcpy((char *)weaponData[weaponNum].weaponIcon, "gfx/hud/w_icon_melee");
}
// setup the shader we will use for the icon // setup the shader we will use for the icon
if (weaponData[weaponNum].weaponIcon[0]) if (weaponData[weaponNum].weaponIcon[0])
{ {

BIN
z_vr_assets_jko/gfx/hud/w_icon_melee.tga Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
z_vr_assets_jko/gfx/hud/w_icon_melee_na.tga Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB