From 18a48546fe227992b55aa04504ddecc10395d369 Mon Sep 17 00:00:00 2001
From: Voxel9 <16278868+Voxel9@users.noreply.github.com>
Date: Mon, 28 May 2018 11:24:57 +0100
Subject: [PATCH] Remove "LED" text and replace with LLE flags text

---
 resource/Cxbx.aps    | Bin 608320 -> 608244 bytes
 resource/Cxbx.rc     | Bin 38610 -> 38400 bytes
 src/Cxbx/ResCxbx.h   |   2 +-
 src/Cxbx/WndMain.cpp |  32 +++++++++++++++++++++++++-------
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/resource/Cxbx.aps b/resource/Cxbx.aps
index 1d8b4795a38fabbf8d760bb044e604682bb8249b..1ad60aa565fd31a784075c520185baa94fa8514b 100644
GIT binary patch
delta 3342
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
A&;S4c

delta 3557
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
Z&cd8;1ikz(krj8Ar?|ILqQFWi<9~_T&lvy!

diff --git a/resource/Cxbx.rc b/resource/Cxbx.rc
index 82c6d97f8443f81f1807a3daaa6a0548b32a755b..63844270c35a8f601645505c835e35e9b88b5174 100644
GIT binary patch
delta 52
zcmV-40L%Z<tpb3o0<g3;lc*vPli(o+lTb7av&J^c2$R%4LbK98Fhr9uYaWwigC>*A
KliITahR_gNbr$CU

delta 50
zcmV-20L}k^tOC-l0<g3;lc+Zov)DGs2n9?4MF2#Tp&~bv;2{RH;y*A%lYoS<la7))
Ivl@iv5f(@lCIA2c

diff --git a/src/Cxbx/ResCxbx.h b/src/Cxbx/ResCxbx.h
index b12bd1de5..d7f5b678a 100644
--- a/src/Cxbx/ResCxbx.h
+++ b/src/Cxbx/ResCxbx.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by C:\Users\anonymous\Documents\xbox\Cxbx-Reloaded\resource\Cxbx.rc
+// Used by C:\Work\Cxbx-Reloaded\resource\Cxbx.rc
 //
 #define IDI_CXBX                        101
 #define IDB_SPLASH                      102
diff --git a/src/Cxbx/WndMain.cpp b/src/Cxbx/WndMain.cpp
index 7f85f0a48..c33807300 100644
--- a/src/Cxbx/WndMain.cpp
+++ b/src/Cxbx/WndMain.cpp
@@ -1924,7 +1924,7 @@ void WndMain::UpdateCaption()
 		char sMenu[32];
 		mii.dwTypeData = &sMenu[0];
 
-		if (m_bIsStarted) {
+		if (m_bIsStarted) { 
 			if (g_EmuShared != NULL) {
 				float currentFPSVal = 0;
 				float currentMSpFVal = 0;
@@ -2325,9 +2325,18 @@ void WndMain::DrawLedBitmap(HWND hwnd, bool bdefault)
 	HMENU hMenu = GetMenu(hwnd);
 	int ActiveLEDColor;
 
-	// When so requested, or when not emulating, draw a black bitmap
+	MENUITEMINFO mii = { 0 };
+	mii.cbSize = sizeof(mii);
+	mii.fMask = MIIM_FTYPE | MIIM_BITMAP | MIIM_STRING;
+	char flagString[10] = "LLE-";
+	mii.dwTypeData = &flagString[0];
+	mii.fType = MFT_RIGHTJUSTIFY;
+	mii.hbmpItem = m_LedBmp;
+
+	// When so requested, or when not emulating, draw a black bitmap and hide LLE flags string
 	if (bdefault || !m_bIsStarted) {
 		ActiveLEDColor = XBOX_LED_COLOUR_OFF;
+		sprintf(flagString, " ");
 	}
 	else { // draw colored bitmap
 		int LedSequence[4] = { XBOX_LED_COLOUR_OFF, XBOX_LED_COLOUR_OFF, XBOX_LED_COLOUR_OFF, XBOX_LED_COLOUR_OFF };
@@ -2338,6 +2347,20 @@ void WndMain::DrawLedBitmap(HWND hwnd, bool bdefault)
 		// Select active color and cycle through all 4 phases in the sequence
 		ActiveLEDColor = LedSequence[LedSequenceOffset & 3];
 		++LedSequenceOffset;
+
+		// Set LLE flags string based on selected LLE flags
+		if (m_FlagsLLE & LLE_APU) {
+			strcat(flagString, "A");
+		}
+		if (m_FlagsLLE & LLE_GPU) {
+			strcat(flagString, "G");
+		}
+		if (m_FlagsLLE & LLE_JIT) {
+			strcat(flagString, "J");
+		}
+		if (m_FlagsLLE == 0) {
+			sprintf(flagString, "HLE");
+		}
 	}
 
 	SelectObject(m_LedDC, m_Brushes[ActiveLEDColor]);
@@ -2347,11 +2370,6 @@ void WndMain::DrawLedBitmap(HWND hwnd, bool bdefault)
 	Rectangle(m_LedDC, 0, 0, m_xBmp, m_yBmp);
 	m_LedBmp = (HBITMAP)SelectObject(m_LedDC, m_OriLed);
 
-	MENUITEMINFO mii = { 0 };
-	mii.cbSize = sizeof(mii);
-	mii.fMask = MIIM_FTYPE | MIIM_BITMAP;
-	mii.fType = MFT_RIGHTJUSTIFY;
-	mii.hbmpItem = m_LedBmp;
 	SetMenuItemInfo(hMenu, ID_LED, FALSE, &mii);
 
 	DrawMenuBar(hwnd);