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

Staff-saber now allows bottom blade to be shut off

Browse source 
Use B to toggle:  Two Blades -> Single Blade -> Off
This commit is contained in:
Simon 2023-07-10 22:05:46 +01:00
parent f4d9ab0854
commit 5cffb00cd4
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp
View file

@ -2854,14 +2854,32 @@ void CG_EnterScope_f( )
void CG_ToggleSaber_f( ) void CG_ToggleSaber_f( )
{ {
if (player->client->ps.saber->Active()) bool deactivated = false;
if (player->client->ps.saber[0].numBlades > 1)
{
if (player->client->ps.saber[0].blade[0].active && player->client->ps.saber[0].blade[1].active)
{
player->client->ps.SaberBladeActivate( 0, 1, qfalse );
deactivated = true;
}
else if (player->client->ps.saber[0].blade[0].active)
{
player->client->ps.SaberBladeActivate( 0, 0, qfalse );
deactivated = true;
}
else
{
player->client->ps.saber[0].Activate();
}
}
else if (player->client->ps.saber->Active())
{ {
player->client->ps.saber[0].Deactivate(); player->client->ps.saber[0].Deactivate();
if (player->client->ps.dualSabers) if (player->client->ps.dualSabers)
{ {
player->client->ps.saber[1].Deactivate(); player->client->ps.saber[1].Deactivate();
} }
G_SoundOnEnt( player, CHAN_WEAPON, "sound/weapons/saber/saberoffquick.wav" ); deactivated = true;
} }
else else
{ {
@ -2871,6 +2889,11 @@ void CG_ToggleSaber_f( )
player->client->ps.saber[1].Activate(); player->client->ps.saber[1].Activate();
} }
} }
if (deactivated)
{
G_SoundOnEnt( player, CHAN_WEAPON, "sound/weapons/saber/saberoffquick.wav" );
}
} }
//Selects the currently selected thing (if one _is_ selected) //Selects the currently selected thing (if one _is_ selected)