Commit 79a36c95 authored by Gerhard Stein's avatar Gerhard Stein

Heavy menu structure changes

parent 5cd441f2
......@@ -40,7 +40,7 @@ m_restartVideo(restartVideo)
void CMenu::init( menutypes menu_type )
{
m_menu_type = menu_type;
/*m_menu_type = menu_type;
m_selection = NO_SELECTION; // Nothing has been selected yet.
switch(m_menu_type)
......@@ -80,12 +80,12 @@ void CMenu::init( menutypes menu_type )
m_SubMenus.push_back(new CLoadMenu(m_dlg_theme, m_SavedGame)); break;
default:
break;
}
}*/
}
void CMenu::initMainMenu()
{
mp_Dialog = new CDialog(17, 10, INPUT_MODE_UP_DOWN,m_dlg_theme);
/*mp_Dialog = new CDialog(17, 10, INPUT_MODE_UP_DOWN,m_dlg_theme);
// Being at Intro, Title or Demo mode
if( m_menu_mode == PASSIVE )
......@@ -110,7 +110,7 @@ void CMenu::initMainMenu()
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 6, "Back to Game");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 7, "End Game");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 8, "Quit");
}
}*/
}
////
......@@ -118,7 +118,7 @@ void CMenu::initMainMenu()
////
void CMenu::process()
{
if( g_pInput->getHoldedKey(KM) && g_pInput->getHoldedKey(KO) && g_pInput->getHoldedKey(KD) )
/*if( g_pInput->getHoldedKey(KM) && g_pInput->getHoldedKey(KO) && g_pInput->getHoldedKey(KD) )
{
cleanup();
init(MODCONF);
......@@ -173,12 +173,12 @@ void CMenu::process()
}
processMainMenu();
}
}*/
}
void CMenu::processMainMenu()
{
if( m_selection != NO_SELECTION )
/*if( m_selection != NO_SELECTION )
{
if( m_menu_mode == PASSIVE )
{
......@@ -207,7 +207,7 @@ void CMenu::processMainMenu()
case 7: init(QUIT);break;
}
}
}
}*/
}
////
......@@ -216,16 +216,16 @@ void CMenu::processMainMenu()
void CMenu::cleanup()
{
// Close the old menu
while(!m_SubMenus.empty())
/*while(!m_SubMenus.empty())
{
delete m_SubMenus.front();
m_SubMenus.pop_back();
}
SAFE_DELETE(mp_Dialog);
SAFE_DELETE(mp_Dialog);*/
}
CMenu::~CMenu()
{
cleanup();
//cleanup();
}
......@@ -23,7 +23,7 @@ m_must_restart_sounddriver(false)
{
m_current = -1;
mp_Dialog = new CDialog(30, 7, INPUT_MODE_OPTION,m_dlg_theme);
/*mp_Dialog = new CDialog(30, 7, INPUT_MODE_OPTION,m_dlg_theme);
m_Rate = g_pSound->getAudioSpec().freq;
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 1, "Rate: " + itoa(m_Rate) +" kHz");
......@@ -55,13 +55,13 @@ m_must_restart_sounddriver(false)
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 4, buf);
mp_Dialog->m_dlgobject.at(3)->m_Option->m_value = m_Soundblaster;
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 5, "Adjust Volume");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 5, "Adjust Volume");*/
}
void CAudioSettings::processSpecific()
{
if(!m_suspended)
/*if(!m_suspended)
{
std::string buf;
......@@ -169,7 +169,7 @@ void CAudioSettings::processSpecific()
SAFE_DELETE(mp_VolumeMenu);
m_suspended = false;
}
}
}*/
}
void CAudioSettings::setFrequencyFromSlot(int value)
......@@ -184,7 +184,3 @@ void CAudioSettings::setFrequencyFromSlot(int value)
}
}
CAudioSettings::~CAudioSettings() {
if(mp_Dialog) delete mp_Dialog;
mp_Dialog = NULL;
}
......@@ -19,7 +19,6 @@ public:
CAudioSettings(Uint8 dlg_theme, CExeFile &ExeFile);
void processSpecific();
void setFrequencyFromSlot(int value);
virtual ~CAudioSettings();
private:
......
......@@ -8,34 +8,18 @@
#include "sdl/input/CInput.h"
#include "CBaseMenu.h"
CBaseMenu::CBaseMenu(Uint8 dlg_theme) :
CBaseMenu::CBaseMenu(const Uint8 dlgTheme) /*:
m_mustclose(false),
m_selection(NO_SELECTION),
mp_Dialog(NULL),
m_dlg_theme(dlg_theme),
m_suspended(false),
m_noenter(false)
m_noenter(false)*/
{}
std::string CBaseMenu::getSwitchString(const bool value)
void CBaseMenu::process()
{
std::string text;
if(m_dlg_theme == DLG_THEME_GALAXY)
{
text = (value==true) ? "on" : "off";
}
else
{
const int start_off = (value==true) ? 28 : 20;
for(int c=start_off ; c<start_off+4 ; c++)
text += c;
}
return text;
}
void CBaseMenu::processCommon()
{
if(!m_suspended)
/*if(!m_suspended)
{
// Get Input for selection
if(!m_noenter)
......@@ -53,30 +37,11 @@ void CBaseMenu::processCommon()
m_mustclose = true;
}
}
}
void CBaseMenu::postProcess()
{
if(!m_suspended)
{
if(!mp_Dialog)
{
m_mustclose = true;
return;
}
mp_Dialog->processInput();
mp_Dialog->draw();
}
}*/
}
bool CBaseMenu::mustClose()
{ return m_mustclose; }
CBaseMenu::~CBaseMenu()
{
CBaseMenu::~CBaseMenu() {
if(mp_Dialog) delete mp_Dialog;
mp_Dialog = NULL;
}
......@@ -37,34 +37,12 @@ enum menumodes{
class CBaseMenu {
public:
CBaseMenu(Uint8 dlg_theme);
/*
* \brief
* This function returns a string of character why will show whether the switch is on or off
* We use a function for that because sometimes when using special fontmaps it is not so clear
* how the string is formed
*/
std::string getSwitchString(const bool value);
CBaseMenu(const Uint8 dlgTheme);
// Processes the stuff that the menus have in common
virtual void processCommon();
// Processes the stuff that are specific for the derived menu
virtual void processSpecific() {}
// Process more common stuff, like drawing or reading input of mp_Dialog
virtual void postProcess();
bool mustClose();
virtual void process();
virtual ~CBaseMenu();
protected:
bool m_mustclose;
int m_selection;
CDialog *mp_Dialog;
Uint8 m_dlg_theme;
bool m_suspended;
bool m_noenter;
};
#endif /* CBASEMENU_H_ */
......@@ -12,7 +12,7 @@ CCameraSettings::CCameraSettings(Uint8 dlg_theme):
CBaseMenu(dlg_theme),
m_CameraBounds(g_pVideoDriver->getCameraBounds())
{
std::string buf;
/*std::string buf;
mp_Dialog = new CDialog(18, 13, INPUT_MODE_UP_DOWN, m_dlg_theme);
mp_Dialog->addObject(DLG_OBJ_TEXT, 1, 1, " Adjust Bounds: ");
......@@ -27,12 +27,12 @@ m_CameraBounds(g_pVideoDriver->getCameraBounds())
mp_Dialog->addObject(DLG_OBJ_TEXT, 1, 10, " Speed (1-50): ");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 11, " "+itoa(m_CameraBounds.speed));
mp_Dialog->setInputMode(INPUT_MODE_COUNTER);
mp_Dialog->setInputMode(INPUT_MODE_COUNTER);*/
}
void CCameraSettings::processSpecific()
{
if(mp_Dialog->getSelection() == 2)
/*if(mp_Dialog->getSelection() == 2)
{
mp_Dialog->m_min = 50;
mp_Dialog->m_max = 270;
......@@ -61,16 +61,16 @@ void CCameraSettings::processSpecific()
mp_Dialog->m_min = 1;
mp_Dialog->m_max = 50;
mp_Dialog->m_length = 2;
}
}*/
m_CameraBounds.left = atoi(mp_Dialog->m_dlgobject.at(2)->m_Option->m_text);
/*m_CameraBounds.left = atoi(mp_Dialog->m_dlgobject.at(2)->m_Option->m_text);
m_CameraBounds.right = atoi(mp_Dialog->m_dlgobject.at(4)->m_Option->m_text);
m_CameraBounds.up = atoi(mp_Dialog->m_dlgobject.at(6)->m_Option->m_text);
m_CameraBounds.down = atoi(mp_Dialog->m_dlgobject.at(8)->m_Option->m_text);
m_CameraBounds.speed = atoi(mp_Dialog->m_dlgobject.at(10)->m_Option->m_text);
m_CameraBounds.speed = atoi(mp_Dialog->m_dlgobject.at(10)->m_Option->m_text);*/
#ifndef NOKEYBOARD
if( m_selection != NO_SELECTION)
/*if( m_selection != NO_SELECTION)
{
if(mp_Dialog->getInputMode(INPUT_MODE_COUNTER))
{
......@@ -97,7 +97,7 @@ void CCameraSettings::processSpecific()
mp_Dialog->setInputMode(INPUT_MODE_COUNTER);
m_selection = NO_SELECTION;
}
}
}*/
#endif
}
......
......@@ -14,7 +14,7 @@ CBaseMenu(dlg_theme),
m_question(question),
m_to_be_confirmed(to_be_confirmed)
{
mp_Dialog = new CDialog(22, 5, 'l',m_dlg_theme);
/*mp_Dialog = new CDialog(22, 5, 'l',m_dlg_theme);
std::string text;
......@@ -29,19 +29,19 @@ m_to_be_confirmed(to_be_confirmed)
mp_Dialog->addObject(DLG_OBJ_TEXT, 1, 1, text);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 3, "Yes");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 15, 3, "No");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 15, 3, "No");*/
}
void CConfirmMenu::processSpecific()
{
if( m_selection != NO_SELECTION )
/*if( m_selection != NO_SELECTION )
{
m_to_be_confirmed = (m_selection == 1) ? true : false;
m_mustclose = true;
}
}*/
}
CConfirmMenu::~CConfirmMenu()
{
SAFE_DELETE(mp_Dialog);
//SAFE_DELETE(mp_Dialog);
}
......@@ -38,7 +38,7 @@ CBaseMenu(dlg_theme),
m_chosenPlayer(0),
m_waiting_for_input(false)
{
m_suspended = true;
/*m_suspended = true;
std::list<std::string> players_list;
for(size_t i=1 ; i<=MAX_PLAYERS ; i++)
......@@ -54,14 +54,14 @@ m_waiting_for_input(false)
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, i+1, actionsnames[i]);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, MAX_COMMANDS+1, "");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 2, MAX_COMMANDS+2, "Reset Controls");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 2, MAX_COMMANDS+2, "Reset Controls");*/
}
void CControlsettings::setControlsText()
{
// Here it sets up the items after the player number was chosen
// Then create the controls selection screen
std::string buf, buf2;
/*std::string buf, buf2;
for(unsigned int i=0 ; i<MAX_COMMANDS ; i++)
{
......@@ -72,12 +72,12 @@ void CControlsettings::setControlsText()
buf = "Two Button Firing " + getSwitchString(g_pInput->getTwoButtonFiring(m_chosenPlayer-1));
mp_Dialog->m_dlgobject.at(MAX_COMMANDS)->m_Option->m_FontMapID = 1;
mp_Dialog->setObjectText(MAX_COMMANDS, buf);
mp_Dialog->setObjectText(MAX_COMMANDS, buf);*/
}
void CControlsettings::processSpecific()
{
if(!m_suspended)
/*if(!m_suspended)
{
if(m_waiting_for_input) // This part only happens, when waiting for an input
processWaitInput();
......@@ -102,12 +102,12 @@ void CControlsettings::processSpecific()
else
setControlsText();
}
}
}*/
}
void CControlsettings::processWaitInput()
{
int item = m_selection;
/*int item = m_selection;
while( !g_pInput->readNewEvent(m_chosenPlayer-1,item) );
std::string buf;
......@@ -119,12 +119,12 @@ void CControlsettings::processWaitInput()
mp_Dialog->setObjectText(m_selection, buf + buf2);
mp_Dialog->setInputMode(INPUT_MODE_UP_DOWN);
m_selection = -1;
m_waiting_for_input = false;
m_waiting_for_input = false;*/
}
void CControlsettings::processSelection()
{
if( m_mustclose ) // if the menu must close, save the settings
/*if( m_mustclose ) // if the menu must close, save the settings
{
g_pInput->saveControlconfig();
m_selection = NO_SELECTION;
......@@ -164,5 +164,5 @@ void CControlsettings::processSelection()
m_selection = -1;
}
}
}
}*/
}
......@@ -27,7 +27,7 @@ m_Episode(ExeFile.getEpisode()),
m_GamePath(ExeFile.getDataDirectory()),
m_hideobjects(hideobjects)
{
mp_Dialog = new CDialog(18, 10, INPUT_MODE_UP_DOWN,m_dlg_theme);
/*mp_Dialog = new CDialog(18, 10, INPUT_MODE_UP_DOWN,m_dlg_theme);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 1, "The Menu");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 2, "The Game");
......@@ -36,12 +36,12 @@ m_hideobjects(hideobjects)
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 5, "About ID");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 6, "About CG");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 7, "Credits");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 8, "Previews!");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 8, "Previews!");*/
}
void CHelpMenu::processSpecific()
{
if( m_selection != NO_SELECTION)
/*if( m_selection != NO_SELECTION)
{
//m_Map.m_animation_enabled = false;
// no cleanups here, because later we return back to that menu
......@@ -76,10 +76,10 @@ void CHelpMenu::processSpecific()
m_hideobjects = true;
m_selection = NO_SELECTION;
m_mustclose = true;
}
}*/
}
CHelpMenu::~CHelpMenu()
{
SAFE_DELETE(mp_Dialog);
//SAFE_DELETE(mp_Dialog);
}
......@@ -12,7 +12,7 @@ CLoadMenu::CLoadMenu(Uint8 dlg_theme, CSavedGame &SavedGame) :
CBaseMenu(dlg_theme),
m_SavedGame(SavedGame)
{
mp_Dialog = new CDialog(MENU_WIDTH, 22, INPUT_MODE_UP_DOWN, m_dlg_theme);
/*mp_Dialog = new CDialog(MENU_WIDTH, 22, INPUT_MODE_UP_DOWN, m_dlg_theme);
// Load the state-file list
std::vector<std::string> StateFileList = m_SavedGame.getSlotList();
......@@ -28,12 +28,12 @@ m_SavedGame(SavedGame)
}
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, i, text);
}
}*/
}
void CLoadMenu::processSpecific()
{
if( m_selection != NO_SELECTION)
/*if( m_selection != NO_SELECTION)
{
if(mp_Dialog->m_name == m_SavedGame.getEmptyString())
{
......@@ -46,11 +46,11 @@ void CLoadMenu::processSpecific()
m_mustclose = true;
}
m_selection = NO_SELECTION;
}
}*/
}
CLoadMenu::~CLoadMenu()
{
if(mp_Dialog) delete mp_Dialog;
mp_Dialog = NULL;
/*if(mp_Dialog) delete mp_Dialog;
mp_Dialog = NULL;*/
}
......@@ -14,7 +14,7 @@ COptions::COptions(Uint8 dlg_theme, stOption *p_option) :
CBaseMenu(dlg_theme),
mp_option(g_pBehaviorEngine->m_option)
{
int i;
/*int i;
std::string buf;
mp_Dialog = new CDialog(27, NUM_OPTIONS+2, INPUT_MODE_UP_DOWN, dlg_theme);
......@@ -25,12 +25,12 @@ mp_option(g_pBehaviorEngine->m_option)
buf = mp_option[i].menuname + " " + getSwitchString(mp_option[i].value);
mp_Dialog->m_dlgobject.at(i)->m_Option->m_FontMapID = 1;
mp_Dialog->setObjectText(i, buf);
}
}*/
}
void COptions::processSpecific()
{
std::string buf;
/*std::string buf;
if(m_mustclose) // If menu is about to close save the options
g_pSettings->saveGameCfg();
......@@ -43,10 +43,5 @@ void COptions::processSpecific()
mp_Dialog->setObjectText(m_selection, buf);
m_selection = NO_SELECTION;
}
}
COptions::~COptions() {
if(mp_Dialog) delete mp_Dialog;
mp_Dialog = NULL;
}*/
}
......@@ -15,7 +15,6 @@ class COptions : public CBaseMenu {
public:
COptions(Uint8 dlg_theme, stOption *p_option);
void processSpecific();
virtual ~COptions();
private:
stOption *mp_option;
......
......@@ -21,12 +21,13 @@ CBaseMenu(dlg_theme)
profile_list.push_back("Classic mode");
profile_list.push_back("Enhanced mode");
mp_SubMenu = new CSelectionMenu<int>( m_selection, profile_list, m_dlg_theme );
//mp_SubMenu = new CSelectionMenu<int>( m_selection, profile_list, m_dlg_theme );
}
void CProfilesMenu::processSpecific()
{
if(mp_SubMenu.get()) {
/*if(mp_SubMenu.get())
{
mp_SubMenu->processCommon();
mp_SubMenu->processSpecific();
mp_SubMenu->postProcess();
......@@ -46,7 +47,7 @@ void CProfilesMenu::processSpecific()
{
mp_SubMenu = NULL;
m_mustclose = true;
}
}*/
}
/**
......
......@@ -20,7 +20,7 @@ mp_OverwriteMenu(NULL),
m_SavedGame(SavedGame),
m_overwrite(false)
{
std::string text;
/*std::string text;
mp_Dialog = new CDialog(MENU_WIDTH, 22, INPUT_MODE_UP_DOWN, m_dlg_theme);
m_selection = NO_SELECTION;
......@@ -36,12 +36,12 @@ m_overwrite(false)
mp_Dialog->m_name = text;
}
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, i, text);
}
}*/
}
void CSaveMenu::processSpecific()
{
if(!mp_OverwriteMenu)
/*if(!mp_OverwriteMenu)
{
if( m_selection != NO_SELECTION )
{
......@@ -110,20 +110,15 @@ void CSaveMenu::processSpecific()
}
}
}
}*/
}
void CSaveMenu::saveSelection()
{
mp_Dialog->setObjectText(m_selection, mp_Dialog->m_name);
/*mp_Dialog->setObjectText(m_selection, mp_Dialog->m_name);
m_SavedGame.prepareSaveGame(m_selection+1, mp_Dialog->m_name);
m_selection = NO_SELECTION;
mp_Dialog->setInputMode(INPUT_MODE_UP_DOWN);
mp_Dialog->setInputMode(INPUT_MODE_UP_DOWN);*/
}
CSaveMenu::~CSaveMenu()
{
if(mp_Dialog) delete mp_Dialog;
mp_Dialog = NULL;
}
......@@ -17,7 +17,6 @@ public:
CSaveMenu(Uint8 dlg_theme, CSavedGame &SavedGame);
void processSpecific();
void saveSelection();
virtual ~CSaveMenu();
private:
CConfirmMenu *mp_OverwriteMenu;
......
......@@ -35,29 +35,29 @@ public:
height = item_list.size()+2;
mp_Dialog = new CDialog(width, height, INPUT_MODE_UP_DOWN, dlg_theme);
/*mp_Dialog = new CDialog(width, height, INPUT_MODE_UP_DOWN, dlg_theme);
item = item_list.begin();
for(size_t pos=1; item != item_list.end() ; item++, pos++)
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, pos, *item);
mp_Dialog->setSelection(defaultselection);
mp_Dialog->setSelection(defaultselection);*/
}
void processSpecific()
{
if( m_selection != NO_SELECTION)
/*if( m_selection != NO_SELECTION)
{
m_selecteditem = m_selection + 1;
m_mustclose = true;
}
}*/
}
virtual ~CSelectionMenu()
{
if(mp_Dialog)
/*if(mp_Dialog)
delete mp_Dialog;
mp_Dialog = NULL;
mp_Dialog = NULL;*/
}
private:
......
......@@ -24,7 +24,7 @@ mp_option(g_pBehaviorEngine->m_option),
m_restartVideo(restartVideo),
m_profileselection(0)
{
mp_Dialog = new CDialog(13, 7, INPUT_MODE_UP_DOWN,m_dlg_theme);
/*mp_Dialog = new CDialog(13, 7, INPUT_MODE_UP_DOWN,m_dlg_theme);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 1, "Graphics");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 2, "Audio");
......@@ -32,7 +32,7 @@ m_profileselection(0)
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 4, "Controls");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 5, "Profile");
m_selection = selection;
m_selection = selection;*/
}
CSettingsMenu::CSettingsMenu( Uint8 dlgtheme, CExeFile &ExeFile, bool &restartVideo ) :
......@@ -43,18 +43,18 @@ mp_option(g_pBehaviorEngine->m_option),
m_restartVideo(restartVideo),
m_profileselection(0)
{
mp_Dialog = new CDialog(13, 7, INPUT_MODE_UP_DOWN,m_dlg_theme);
/*mp_Dialog = new CDialog(13, 7, INPUT_MODE_UP_DOWN,m_dlg_theme);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 1, "Graphics");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 2, "Audio");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 3, "Options");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 4, "Controls");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 5, "Profile");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 5, "Profile");*/
}
void CSettingsMenu::processSpecific()
{
if(!mp_SubMenu)
/*if(!mp_SubMenu)
{
if( m_selection != NO_SELECTION)
{
......@@ -82,6 +82,6 @@ void CSettingsMenu::processSpecific()
SAFE_DELETE(mp_SubMenu);
m_suspended = false;
}
}
}*/
}
......@@ -21,7 +21,7 @@ m_Resolutionlist(g_pVideoDriver->m_Resolutionlist),
m_restartVideo(restartVideo),
mp_CameraSettings(NULL)
{
m_current = -1;
/*m_current = -1;
m_changed = false;
g_pVideoDriver->initResolutionList();
......@@ -90,12 +90,13 @@ mp_CameraSettings(NULL)
mp_Dialog->m_dlgobject.at(7)->m_Option->m_FontMapID = 1;
mp_Dialog->setObjectText(7, buf);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 9, "Adjust Camera Bounds");
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 9, "Adjust Camera Bounds");*/
}
void CVideoSettings::processSpecific(){
void CVideoSettings::processSpecific()
{
if(!mp_CameraSettings)
/*if(!mp_CameraSettings)
{
std::string buf;
m_changed = true;
......@@ -296,5 +297,5 @@ void CVideoSettings::processSpecific(){
SAFE_DELETE(mp_CameraSettings);
m_suspended = false;
}
}
}*/
}
......@@ -15,7 +15,7 @@
CVolumeSettings::CVolumeSettings(Uint8 dlg_theme) :
CBaseMenu(dlg_theme)
{
mp_Dialog = new CDialog(24, 7, INPUT_MODE_UP_DOWN, m_dlg_theme);
/*mp_Dialog = new CDialog(24, 7, INPUT_MODE_UP_DOWN, m_dlg_theme);
m_noenter = true;
mp_Dialog->addObject(DLG_OBJ_TEXT, 1, 1, " Adjust Volume: ");
......@@ -33,12 +33,12 @@ CBaseMenu(dlg_theme)
mp_Dialog->m_noise = false;
mp_Dialog->setInputMode(INPUT_MODE_SLIDER);
mp_Dialog->processInput();
mp_Dialog->setSelection(2);
mp_Dialog->setSelection(2);*/
}
void CVolumeSettings::processSpecific()
{
if(mp_Dialog->getSelection() == 2)
/*if(mp_Dialog->getSelection() == 2)
{
g_pSound->setMusicVolume(mp_Dialog->m_dlgobject.at(2)->m_Option->m_value*8);
mp_Dialog->m_noise = false;
......@@ -47,10 +47,5 @@ void CVolumeSettings::processSpecific()
{
g_pSound->setSoundVolume(mp_Dialog->m_dlgobject.at(4)->m_Option->m_value*8);
mp_Dialog->m_noise = true;
}
}
CVolumeSettings::~CVolumeSettings()
{
//CBaseMenu::~CBaseMenu();