From c850227b288078216d67173e98ff72d5deb6b807 Mon Sep 17 00:00:00 2001
From: nehalmistry <>
Date: Wed, 10 Apr 2002 23:54:06 +0000
Subject: [PATCH] removed CD Audio disabled message, replaced with disabling
button
---
src/include/menus.h | 13 ++++++-------
src/ui/menus.cpp | 39 ++++++++++-----------------------------
2 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/src/include/menus.h b/src/include/menus.h
index 4e7ae5adf..ebd50c7e4 100644
--- a/src/include/menus.h
+++ b/src/include/menus.h
@@ -242,13 +242,12 @@ typedef struct _menus_ {
#define MENU_CAMPAIGN_CONT 13
#define MENU_OBJECTIVES 14
#define MENU_END_SCENARIO 15
-#define MENU_CDROM_DISABLED 16
-#define MENU_SOUND_OPTIONS 17
-#define MENU_PREFERENCES 18
-#define MENU_SPEED_SETTINGS 19
-#define MENU_GAME_OPTIONS 20
-#define MENU_NET_ERROR 21
-#define MENU_MAX 21 /// highest available menu id (for ccl)
+#define MENU_SOUND_OPTIONS 16
+#define MENU_PREFERENCES 17
+#define MENU_SPEED_SETTINGS 18
+#define MENU_GAME_OPTIONS 19
+#define MENU_NET_ERROR 20
+#define MENU_MAX 20 /// highest available menu id (for ccl)
/// FIXME: FILL IN THIS TABLE!!!!
diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp
index c6850ba62..b857377f8 100644
--- a/src/ui/menus.cpp
+++ b/src/ui/menus.cpp
@@ -788,22 +788,6 @@ local Menuitem CampaignContMenuItems[] = {
#endif
};
-local Menuitem CDRomDisabledMenuItems[] = {
-#ifdef __GNUC__
- { MI_TYPE_TEXT, 144, 15, 0, LargeFont, NULL, NULL,
- { text:{ "Sorry, this version of", MI_TFLAGS_CENTERED} } },
- { MI_TYPE_TEXT, 144, 15 + 20*1, 0, LargeFont, NULL, NULL,
- { text:{ "freecraft was not compiled", MI_TFLAGS_CENTERED} } },
- { MI_TYPE_TEXT, 144, 15 + 20*2, 0, LargeFont, NULL, NULL,
- { text:{ "with CD Audio support", MI_TFLAGS_CENTERED} } },
- { MI_TYPE_BUTTON, 144 - (106 / 2), 128 - 15 - 27, MenuButtonSelected, LargeFont, NULL, NULL,
- { button:{ "~!OK", 106, 27, MBUTTON_GM_HALF, EndMenu, 'o'} } },
-#else
- { 0 }
-#endif
-};
-
-
local Menuitem SoundOptionsMenuItems[] = {
#ifdef __GNUC__
{ MI_TYPE_TEXT, 176, 11, 0, LargeFont, NULL, NULL,
@@ -837,14 +821,24 @@ local Menuitem SoundOptionsMenuItems[] = {
{ MI_TYPE_TEXT, 64, 36*5, 0, LargeFont, NULL, NULL,
{ text:{ "CD Volume", MI_TFLAGS_CENTERED} } },
+#if defined(USE_LIBCDA) || defined(USE_SDLCD)
{ MI_TYPE_HSLIDER, 32, 36*5.5, 0, 0, NULL, NULL,
{ hslider:{ 0, 11*18, 18, ScenSelectHSCdVolumeAction, -1, 0, 0, 0, ScenSelectOk} } },
+#else
+ { MI_TYPE_HSLIDER, 32, 36*5.5, -1, 0, NULL, NULL,
+ { hslider:{ 0, 11*18, 18, ScenSelectHSCdVolumeAction, -1, 0, 0, 0, ScenSelectOk} } },
+#endif
{ MI_TYPE_TEXT, 44, 36*6 + 6, 0, SmallFont, NULL, NULL,
{ text:{ "min", MI_TFLAGS_CENTERED} } },
{ MI_TYPE_TEXT, 218, 36*6 + 6, 0, SmallFont, NULL, NULL,
{ text:{ "max", MI_TFLAGS_CENTERED} } },
+#if defined(USE_LIBCDA) || defined(USE_SDLCD)
{ MI_TYPE_GEM, 240, 36*5.5, 0, LargeFont, NULL, NULL,
{ gem:{ MI_GSTATE_UNCHECKED, 18, 18, MBUTTON_GEM_SQUARE, SetCdPower} } },
+#else
+ { MI_TYPE_GEM, 240, 36*5.5, -1, LargeFont, NULL, NULL,
+ { gem:{ MI_GSTATE_UNCHECKED, 18, 18, MBUTTON_GEM_SQUARE, SetCdPower} } },
+#endif
{ MI_TYPE_TEXT, 266, 36*5.5 + 2, 0, LargeFont, NULL, NULL,
{ text:{ "Enabled", MI_TFLAGS_LALIGN} } },
@@ -1105,16 +1099,6 @@ global Menu Menus[] = {
EndScenarioMenuItems,
NULL,
},
- {
- // CDRom Disabled Message
- 176+(14*TileSizeX-288)/2,
- 16+(14*TileSizeY-128)/2,
- 288, 128,
- ImagePanel4,
- 0, 4,
- CDRomDisabledMenuItems,
- NULL,
- },
{
// Sound Options Menu
176+(14*TileSizeX-352)/2,
@@ -1860,9 +1844,6 @@ local void SetCdPower(Menuitem *mi)
cd_stop();
CDMode = ":stopped";
}
-#else
- ProcessMenu(MENU_CDROM_DISABLED, 1);
- SoundOptionsMenuItems[i].d.gem.state = MI_GSTATE_UNCHECKED;
#endif
}