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

ST_QUICK_MENU

Browse source
This commit is contained in:
Simon 2023-11-02 21:50:04 +00:00
parent 25987a5fb7
commit e7f8770008
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2952,7 +2952,7 @@ void CG_ItemSelectorSelect_f( void )
cg.forcepowerSelectTime = cg.time; cg.forcepowerSelectTime = cg.time;
cg.forcepowerSelect = cg.itemSelectorSelection; cg.forcepowerSelect = cg.itemSelectorSelection;
} }
else if (cg.itemSelectorType == ST_QUICK_SAVE) { else if (cg.itemSelectorType == ST_QUICK_MENU) {
if (cg.itemSelectorSelection == 0) { if (cg.itemSelectorSelection == 0) {
cgi_SendConsoleCommand("save quick\n"); cgi_SendConsoleCommand("save quick\n");
CG_CenterPrint("Quick Saved", 240); CG_CenterPrint("Quick Saved", 240);
@ -2969,7 +2969,7 @@ void CG_ItemSelectorNext_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER;
return; return;
} }
@ -2986,7 +2986,7 @@ void CG_ItemSelectorPrev_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER;
return; return;
} }
@ -3120,7 +3120,7 @@ void CG_DrawItemSelector( void )
sRGB[1] = 0.0f; sRGB[1] = 0.0f;
sRGB[2] = 1.0f; sRGB[2] = 1.0f;
break; break;
case ST_QUICK_SAVE: case ST_QUICK_MENU:
count = 2; count = 2;
sRGB[0] = 1.0f; sRGB[0] = 1.0f;
sRGB[1] = 1.0f; sRGB[1] = 1.0f;
@ -3252,7 +3252,7 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
selectable = ForcePower_Valid(itemId); selectable = ForcePower_Valid(itemId);
break; break;
case ST_QUICK_SAVE: case ST_QUICK_MENU:
selectable = true; selectable = true;
break; break;
} }
@ -3339,7 +3339,7 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
sprite.customShader = force_icons[showPowers[itemId]]; sprite.customShader = force_icons[showPowers[itemId]];
break; break;
case ST_QUICK_SAVE: case ST_QUICK_MENU:
sprite.customShader = itemId == 0 ? cgs.media.iconSave : cgs.media.iconLoad; sprite.customShader = itemId == 0 ? cgs.media.iconSave : cgs.media.iconLoad;
break; break;
} }

2
Projects/Android/jni/OpenJK/code/qcommon/q_shared.h
View file

@ -769,7 +769,7 @@ typedef enum
ST_GADGET, ST_GADGET,
ST_FIGHTING_STYLE, ST_FIGHTING_STYLE,
ST_FORCE_POWER, ST_FORCE_POWER,
ST_QUICK_SAVE ST_QUICK_MENU
} selectorType_t; } selectorType_t;
typedef enum typedef enum

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

@ -2775,7 +2775,7 @@ void CG_ItemSelectorSelect_f( void )
cg.forcepowerSelectTime = cg.time; cg.forcepowerSelectTime = cg.time;
cg.forcepowerSelect = cg.itemSelectorSelection; cg.forcepowerSelect = cg.itemSelectorSelection;
} }
else if (cg.itemSelectorType == ST_QUICK_SAVE) { else if (cg.itemSelectorType == ST_QUICK_MENU) {
if (cg.itemSelectorSelection == 0) { if (cg.itemSelectorSelection == 0) {
cgi_SendConsoleCommand("save quik*\n"); cgi_SendConsoleCommand("save quik*\n");
CG_CenterPrint("Quick Saved", 240); CG_CenterPrint("Quick Saved", 240);
@ -2792,7 +2792,7 @@ void CG_ItemSelectorNext_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER;
return; return;
} }
@ -2809,7 +2809,7 @@ void CG_ItemSelectorPrev_f( void )
{ {
if (cg.itemSelectorType >= ST_FORCE_POWER) if (cg.itemSelectorType >= ST_FORCE_POWER)
{ {
cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_SAVE : ST_FORCE_POWER; cg.itemSelectorType = (cg.itemSelectorType == ST_FORCE_POWER) ? ST_QUICK_MENU : ST_FORCE_POWER;
return; return;
} }
@ -2938,7 +2938,7 @@ void CG_DrawItemSelector( void )
sRGB[1] = 0.0f; sRGB[1] = 0.0f;
sRGB[2] = 1.0f; sRGB[2] = 1.0f;
break; break;
case ST_QUICK_SAVE: case ST_QUICK_MENU:
count = 2; count = 2;
sRGB[0] = 1.0f; sRGB[0] = 1.0f;
sRGB[1] = 1.0f; sRGB[1] = 1.0f;
@ -3068,7 +3068,7 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
selectable = ForcePower_Valid(itemId); selectable = ForcePower_Valid(itemId);
break; break;
case ST_QUICK_SAVE: case ST_QUICK_MENU:
selectable = true; selectable = true;
break; break;
} }
@ -3155,7 +3155,7 @@ void CG_DrawItemSelector( void )
case ST_FORCE_POWER: // force powers case ST_FORCE_POWER: // force powers
sprite.customShader = force_icons[showPowers[itemId]]; sprite.customShader = force_icons[showPowers[itemId]];
break; break;
case ST_QUICK_SAVE: case ST_QUICK_MENU:
sprite.customShader = itemId == 0 ? cgs.media.iconSave : cgs.media.iconLoad; sprite.customShader = itemId == 0 ? cgs.media.iconSave : cgs.media.iconLoad;
break; break;
} }