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

Improve level transition fix (not all powers are updatable)

Browse source
This commit is contained in:
Petr Bartos 2023-11-08 21:11:00 +01:00 committed by Simon
parent e5575976db
commit b4ac0894e3
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Projects/Android/jni/OpenJK/code/ui/ui_main.cpp
View file

@ -4771,24 +4771,35 @@ static void UI_ForcePowerWeaponsButton(qboolean activeFlag)
activeFlag = qtrue;
if (!activeFlag) {
// If all force powers are maxed, let us pass
// If updatable force powers are maxed, let us pass
int *forcePowerLevel;
short forcePowerIndex = 0;
client_t* cl = &svs.clients[0];
playerState_t* pState = NULL;
int forcelevel;
qboolean allforcesmaxed = qtrue;
for (int i = 0; i < MAX_POWER_ENUMS; i++) {
if (cl) {
pState = cl->gentity->client;
forcelevel = pState->forcePowerLevel[powerEnums[i].powerEnum];
} else {
forcelevel = uiInfo.forcePowerLevel[powerEnums[i].powerEnum];
}
if (forcelevel < 3) {
allforcesmaxed = qfalse;
break;
}
if (cl) {
playerState_t* pState = cl->gentity->client;
forcePowerLevel = pState->forcePowerLevel;
} else {
forcePowerLevel = uiInfo.forcePowerLevel;
}
activeFlag = allforcesmaxed;
qboolean allForcesMaxed = qtrue;
if (UI_GetForcePowerIndex ( "absorb", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "heal", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "mindtrick", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "protect", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "drain", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "grip", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "lightning", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
} else if (UI_GetForcePowerIndex ( "rage", &forcePowerIndex ) && forcePowerLevel[powerEnums[forcePowerIndex].powerEnum] < 3 ) {
allForcesMaxed = qfalse;
}
activeFlag = allForcesMaxed;
}
// Find weaponsbutton