Fix main menu UI showing in demo, add menu button (not functional yet)

ApplicationResourcePatches/manifest.json

@@ -9,6 +9,8 @@
 		"DITL/2004.json" : "ApplicationResourcePatches/DITL/2004.json",
 		"DITL/2005.json" : "ApplicationResourcePatches/DITL/2005.json",
 		"DITL/2006.json" : "ApplicationResourcePatches/DITL/2006.json",
+		"PICT/1971.bmp" : "ApplicationResourcePatches/PICT/1971.bmp",
+		"PICT/1972.bmp" : "ApplicationResourcePatches/PICT/1972.bmp",
 		"PICT/1973.bmp" : "ApplicationResourcePatches/PICT/1973.bmp",
 		"PICT/1974.bmp" : "ApplicationResourcePatches/PICT/1974.bmp",
 		"PICT/1975.bmp" : "ApplicationResourcePatches/PICT/1975.bmp",

GpApp/GliderStructs.h

@@ -369,7 +369,9 @@ namespace TouchScreenCtrlIDs
 	{
 		Bands,
 		BatteryHelium,
-		Movement,
+		Menu,
+
+		Movement,	// Keep this last
 
 		Count,
 
@@ -432,6 +434,8 @@ namespace touchScreenControlGraphics
 {
 	enum touchScreenControlGraphic
 	{
+		MenuActive,
+		MenuIdle,
 		BandsDisabled,
 		BandsActive,
 		BandsIdle,
@@ -451,7 +455,7 @@ namespace touchScreenControlGraphics
 		Count,
 	};
 
-	static const int kTouchScreenGraphicStartID = 1973;
+	static const int kTouchScreenGraphicStartID = 1971;
 }
 
 typedef touchScreenControlGraphics::touchScreenControlGraphic touchScreenControlGraphic_t;

GpApp/MainMenuUI.cpp

@@ -12,6 +12,7 @@
 #include "PLSysCalls.h"
 #include "RenderedFont.h"
 #include "GpRenderedFontMetrics.h"
+#include "MainMenuUI.h"
 #include "ResolveCachingColor.h"
 #include "PLTimeTaggedVOSEvent.h"
 #include "WindowDef.h"
@@ -397,9 +398,7 @@ static void HandleMainMenuUISelection(MainMenuUIState::ControlID controlID)
 		break;
 
 	case MainMenuUIState::Control_Demo:
-		DismissMainMenuUIPage();
+		DoDemoGame();	// This handles main menu UI by itself
-		DoOptionsMenu(iHelp);
-		StartMainMenuUI();
 		break;
 
 	case MainMenuUIState::Control_AboutApplication:

GpApp/Play.cpp

@@ -12,6 +12,7 @@
 #include "Externs.h"
 #include "Environ.h"
 #include "House.h"
+#include "MainMenuUI.h"
 #include "MainWindow.h"
 #include "PLEventQueue.h"
 #include "PLTimeTaggedVOSEvent.h"
@@ -278,9 +279,15 @@ void DoDemoGame (void)
 	PasStringCopy(theHousesSpecs[thisHouseIndex].m_name, thisHouseName);
 	if (OpenHouse())
 	{
+		if (thisMac.isTouchscreen)
+			DismissMainMenuUI();
+
 		whoCares = ReadHouse();
 		demoGoing = true;
 		NewGame(kNewGameMode);
+
+		if (thisMac.isTouchscreen)
+			StartMainMenuUI();
 	}
 	whoCares = CloseHouse();
 	thisHouseIndex = wasHouseIndex;
@@ -571,6 +578,7 @@ void ResetTouchScreenControlBounds (void)
 	points[TouchScreenCtrlIDs::Movement] = Point::Create(mainWindowRect.left, mainWindowRect.top);
 	points[TouchScreenCtrlIDs::BatteryHelium] = Point::Create(mainWindowRect.left + touchScreenControlEdgeSpacing, mainWindowRect.top + touchScreenControlEdgeSpacing);
 	points[TouchScreenCtrlIDs::Bands] = Point::Create(mainWindowRect.right - touchScreenControlEdgeSpacing - touchScreenControlSize, mainWindowRect.top + touchScreenControlEdgeSpacing);
+	points[TouchScreenCtrlIDs::Menu] = Point::Create(points[TouchScreenCtrlIDs::Bands].h - touchScreenControlInterSpacing - touchScreenControlSize, points[TouchScreenCtrlIDs::BatteryHelium].v);
 
 	for (int i = 0; i < TouchScreenCtrlIDs::Count; i++)
 		sizes[i] = Point::Create(touchScreenControlSize, touchScreenControlSize);
@@ -628,6 +636,7 @@ void PlayGame (void)
 	touchScreen.controls[TouchScreenCtrlIDs::Movement].isEnabled = true;
 	touchScreen.controls[TouchScreenCtrlIDs::Bands].isEnabled = true;
 	touchScreen.controls[TouchScreenCtrlIDs::BatteryHelium].isEnabled = true;
+	touchScreen.controls[TouchScreenCtrlIDs::Menu].isEnabled = true;
 
 	while ((playing) && (!quitting))
 	{

GpApp/Render.cpp

@@ -622,6 +622,7 @@ void RenderTouchScreenControls (void)
 	ctrlGraphics[TouchScreenCtrlIDs::Movement] = nullptr;
 	ctrlGraphics[TouchScreenCtrlIDs::Bands] = touchScreen.graphics[touchScreenControlGraphics::BandsDisabled];
 	ctrlGraphics[TouchScreenCtrlIDs::BatteryHelium] = touchScreen.graphics[touchScreenControlGraphics::BatteryDisabled];
+	ctrlGraphics[TouchScreenCtrlIDs::Menu] = touchScreen.graphics[touchScreenControlGraphics::MenuIdle];
 
 	if (batteryTotal < 0)
 		ctrlGraphics[TouchScreenCtrlIDs::BatteryHelium] = touchScreen.graphics[touchScreenControlGraphics::HeliumIdle];
@@ -645,6 +646,8 @@ void RenderTouchScreenControls (void)
 			if (bandsTotal > 0)
 				ctrlGraphics[TouchScreenCtrlIDs::Bands] = touchScreen.graphics[touchScreenControlGraphics::BandsActive];
 		}
+		else if (touchScreen.fingers[i].capturingControl == TouchScreenCtrlIDs::Menu)
+			ctrlGraphics[TouchScreenCtrlIDs::Menu] = touchScreen.graphics[touchScreenControlGraphics::MenuActive];
 	}
 
 	for (int i = 0; i < TouchScreenCtrlIDs::Count; i++)