Move speed selector back to X, add exit to menu to radial quick menu instead

Projects/Android/jni/OpenJK/JKXR/VrInputDefault.cpp

@@ -859,11 +859,11 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
                     v[1] * (vr.move_speed == 0 ? 0.75f : (vr.move_speed == 1 ? 1.0f : 0.5f));
             
 
-            //X button invokes menu now
-            if ((secondaryButtonsNew & secondaryButton1) &&
-                !(secondaryButtonsOld & secondaryButton1))
-            {
-                Sys_QueEvent(0, SE_KEY, A_ESCAPE, true, 0, NULL);
+            if (((secondaryButtonsNew & secondaryButton1) !=
+                (secondaryButtonsOld & secondaryButton1)) &&
+                    (secondaryButtonsNew & secondaryButton1)) {
+                //Toggle walk/run somehow?!
+                vr.move_speed = (++vr.move_speed) % 3;
             }
 
             //Open the datapad

Projects/Android/jni/OpenJK/code/cgame/cg_main.cpp

@@ -1463,6 +1463,7 @@ static void CG_RegisterGraphics( void ) {
 
 	cgs.media.iconSave = cgi_R_RegisterShaderNoMip( "gfx/icon_save" );
 	cgs.media.iconLoad = cgi_R_RegisterShaderNoMip( "gfx/icon_load" );
+	cgs.media.iconExit = cgi_R_RegisterShaderNoMip( "gfx/icon_exit" );
 
 	// FIXME: do these conditionally
 	cgi_R_RegisterShader( "gfx/2d/workingCamera" );

Projects/Android/jni/OpenJK/code/cgame/cg_media.h

@@ -150,6 +150,7 @@ typedef struct {
 
 	qhandle_t 	iconSave;
 	qhandle_t 	iconLoad;
+	qhandle_t 	iconExit;
 
 //Chunks
 	qhandle_t	chunkModels[NUM_CHUNK_TYPES][4];

Projects/Android/jni/OpenJK/code/cgame/cg_weapons.cpp

@@ -2954,13 +2954,12 @@ void CG_ItemSelectorSelect_f( void )
 	}
 	else if (cg.itemSelectorType == ST_QUICK_MENU) {
 		if (cg.itemSelectorSelection == 0) {
-			cgi_SendConsoleCommand("save quick\n");
-			CG_CenterPrint("Quick Saved", 240);
+			cgi_SendConsoleCommand("togglemenu\n");
 		} else if (cg.itemSelectorSelection == 1) {
-			cgi_SendConsoleCommand("load quick\n");
-		}
-		else {
-			vr->move_speed = (++vr->move_speed) % 3;
+			cgi_SendConsoleCommand("save quik*\n");
+			CG_CenterPrint("Quick Saved", 240);
+		} else {
+			cgi_SendConsoleCommand("load quik\n");
 		}
 	}
 
@@ -3346,13 +3345,13 @@ void CG_DrawItemSelector( void )
 							switch (itemId)
 							{
 							case 0:
-								sprite.customShader = cgs.media.iconSave;
+								sprite.customShader = cgs.media.iconExit;
 								break;
 							case 1:
-								sprite.customShader = cgs.media.iconLoad;
+								sprite.customShader = cgs.media.iconSave;
 								break;
 							case 2:
-								sprite.customShader = cgs.media.iconMoveSpeed[(vr->move_speed+1)%3];
+								sprite.customShader = cgs.media.iconLoad;
 								break;
 							}
 							break;

Projects/Android/jni/OpenJK/codeJK2/cgame/cg_main.cpp

@@ -1336,6 +1336,7 @@ static void CG_RegisterGraphics( void ) {
 
 	cgs.media.iconSave = cgi_R_RegisterShaderNoMip( "gfx/icon_save" );
 	cgs.media.iconLoad = cgi_R_RegisterShaderNoMip( "gfx/icon_load" );
+	cgs.media.iconExit = cgi_R_RegisterShaderNoMip( "gfx/icon_exit" );
 
 
 	// FIXME: do these conditionally

Projects/Android/jni/OpenJK/codeJK2/cgame/cg_media.h

@@ -107,6 +107,7 @@ typedef struct {
 
 	qhandle_t 	iconSave;
 	qhandle_t 	iconLoad;
+	qhandle_t 	iconExit;
 
 	int			currentDataPadIconBackground;
 

Projects/Android/jni/OpenJK/codeJK2/cgame/cg_weapons.cpp

@@ -2777,14 +2777,13 @@ void CG_ItemSelectorSelect_f( void )
 	}
 	else if (cg.itemSelectorType == ST_QUICK_MENU) {
 		if (cg.itemSelectorSelection == 0) {
+			cgi_SendConsoleCommand("togglemenu\n");
+		} else if (cg.itemSelectorSelection == 1) {
 			cgi_SendConsoleCommand("save quik*\n");
 			CG_CenterPrint("Quick Saved", 240);
-		} else if (cg.itemSelectorSelection == 1) {
+		} else {
 			cgi_SendConsoleCommand("load quik\n");
 		}
-		else {
-			vr->move_speed = (++vr->move_speed) % 3;
-		}
 	}
 
 	//reset ready for next time
@@ -3162,13 +3161,13 @@ void CG_DrawItemSelector( void )
 							switch (itemId)
 							{
 							case 0:
-								sprite.customShader = cgs.media.iconSave;
+								sprite.customShader = cgs.media.iconExit;
 								break;
 							case 1:
-								sprite.customShader = cgs.media.iconLoad;
+								sprite.customShader = cgs.media.iconSave;
 								break;
 							case 2:
-								sprite.customShader = cgs.media.iconMoveSpeed[(vr->move_speed + 1) % 3];
+								sprite.customShader = cgs.media.iconLoad;
 								break;
 							}
 							break;