data/translations/text.dat

@@ -62,6 +62,16 @@ eng=EXIT
 eng=BACK
 
 ; Controls menu
+[STR__FRONTEND__CONTROL_STYLE]
+eng=CONTROL STYLE
+[STR__FRONTEND__A]
+eng=A
+[STR__FRONTEND__B]
+eng=B
+[STR__FRONTEND__C]
+eng=C
+[STR__FRONTEND__D]
+eng=D
 
 ; Screen menu
 

makefile.gfx

@@ -91,7 +91,9 @@ UI_GFX_FONT_IN :=			$(foreach FILE,$(UI_GFX_FONT),$(UI_GFX_DIR)/$(FILE).anm)
 UI_GFX_NONTRANS :=			
 UI_GFX_NONTRANS_IN :=		$(foreach FILE,$(UI_GFX_NONTRANS),$(UI_GFX_DIR)/$(FILE))
 
-UI_GFX_TRANS :=				+vbamboo.bmp +cross.bmp +tick.bmp +hbamboo.bmp
+UI_GFX_TRANS :=				+vbamboo.bmp +cross.bmp +tick.bmp +hbamboo.bmp \
+							+butU.bmp +butD.bmp +butL.bmp +butR.bmp \
+							+butC.bmp +butS.bmp +butX.bmp +butT.bmp
 UI_GFX_TRANS_IN :=			$(foreach FILE,$(UI_GFX_TRANS),$(UI_GFX_DIR)/$(FILE))
 
 UI_GFX_TEX_IN :=			$(UI_GFX_FONT_IN) ${UI_GFX_NONTRANS_IN} ${UI_GFX_TRANS_IN}

source/frontend/options.cpp

@@ -42,6 +42,10 @@
 #include "gui\gframe.h"
 #endif
 
+#ifndef __GUI_GREADOUT_H__
+#include "gui\greadout.h"
+#endif
+
 #ifndef __LOCALE_TEXTDBASE_H__
 #include "locale\textdbase.h"
 #endif
@@ -78,6 +82,19 @@
 	Vars
 	---- */
 
+int	s_controlButtonData[]=
+{
+	0,1,2,3,
+	-1
+};
+CGUITextReadout::TextReadoutData s_controlReadoutText[]=
+{
+	{	0,STR__FRONTEND__A	},
+	{	1,STR__FRONTEND__B	},
+	{	2,STR__FRONTEND__C	},
+	{	3,STR__FRONTEND__D	},
+};
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:
@@ -121,6 +138,10 @@ void CFrontEndOptions::init()
 
 
 	// Populate CONTROLS menu
+	CGUIFactory::createCycleButtonFrame(m_modeMenus[MODE__CONTROL],
+										X_BORDER,Y_BORDER,412-(X_BORDER*2),40,
+										STR__FRONTEND__CONTROL_STYLE,
+										&m_controlStyle,s_controlButtonData,s_controlReadoutText);
 
 
 	// Populate SCREEN menu
@@ -128,15 +149,15 @@ void CFrontEndOptions::init()
 
 	// Populate SOUND menu
 	CGUIFactory::createSliderButtonFrame(m_modeMenus[MODE__SOUND],
-										 X_BORDER,Y_BORDER,412-(X_BORDER*2),30,
+										 X_BORDER,Y_BORDER,412-(X_BORDER*2),35,
 										 STR__FRONTEND__BGM,
 										 &m_bgmVolume,CSoundMediator::MIN_VOLUME,CSoundMediator::MAX_VOLUME);
 	CGUIFactory::createSliderButtonFrame(m_modeMenus[MODE__SOUND],
-										 X_BORDER,Y_BORDER+40,412-(X_BORDER*2),30,
+										 X_BORDER,Y_BORDER+40,412-(X_BORDER*2),35,
 										 STR__FRONTEND__SFX,
 										 &m_sfxVolume,CSoundMediator::MIN_VOLUME,CSoundMediator::MAX_VOLUME);
 	CGUIFactory::createSliderButtonFrame(m_modeMenus[MODE__SOUND],
-										 X_BORDER,Y_BORDER+80,412-(X_BORDER*2),30,
+										 X_BORDER,Y_BORDER+80,412-(X_BORDER*2),35,
 										 STR__FRONTEND__SPEECH,
 										 &m_speechVolume,CSoundMediator::MIN_VOLUME,CSoundMediator::MAX_VOLUME);
 
@@ -152,6 +173,7 @@ void CFrontEndOptions::init()
 	m_bgmVolume=CSoundMediator::getVolume(CSoundMediator::SONG);
 	m_sfxVolume=CSoundMediator::getVolume(CSoundMediator::SFX);
 	m_speechVolume=CSoundMediator::getVolume(CSoundMediator::SPEECH);
+	m_controlStyle=0;
 }
 
 /*----------------------------------------------------------------------
@@ -166,8 +188,7 @@ void CFrontEndOptions::shutdown()
 
 	for(i=0;i<MODE__COUNT;i++)
 	{
-		CGUIControlFrame	**mm=&m_modeMenus[i];
+		m_modeMenus[i]->shutdown();
-		(*mm)->shutdown();
 	}
 	m_background->shutdown();		delete m_background;
 }

source/frontend/options.h

@@ -75,6 +75,7 @@ private:
 	int							m_bgmVolume;
 	int							m_sfxVolume;
 	int							m_speechVolume;
+	int							m_controlStyle;
 
 };
 

source/gui/gfactory.cpp

@@ -93,6 +93,40 @@ void CGUIFactory::createValueButtonFrame(class CGUIObject *_parent,
 		vb->setButtonValue(_value);
 }
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void CGUIFactory::createCycleButtonFrame(class CGUIObject *_parent,
+										 int _x,int _y,int _w,int _h,
+										 int _textId,
+										 int *_target,int *_data,CGUITextReadout::TextReadoutData *_readoutData)
+{
+	CGUIGroupFrame		*fr;
+	CGUITextBox			*tb;
+	CGUICycleButton		*cb;
+	CGUITextReadout		*tr;
+
+	fr=new ("frame") CGUIGroupFrame();
+	fr->init(_parent);
+	fr->setObjectXYWH(_x,_y,_w,_h);
+		tb=new ("textbox") CGUITextBox();
+		tb->init(fr);
+		tb->setObjectXYWH(0,0,_w,(_h*2)/3);
+		tb->setText(_textId);
+		cb=new ("cyclebutton") CGUICycleButton();
+		cb->init(fr);
+		cb->setButtonTarget(_target);
+		cb->setButtonData(_data);
+		tr=new ("textreadout") CGUITextReadout();
+		tr->init(fr);
+		tr->setObjectXYWH(0,(_h*2)/3,_w,(_h*1)/3);
+		tr->setReadoutTarget(_target);
+		tr->setReadoutData(_readoutData);
+}
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/gui/gfactory.h

@@ -20,6 +20,11 @@
 	Includes
 	-------- */
 
+#ifndef __GUI_GREADOUT_H__
+#include "gui\greadout.h"
+#endif
+
+
 /*	Std Lib
 	------- */
 
@@ -40,6 +45,12 @@ public:
 										   int _textId,
 										   int *_target,int _value);
 
+	// Creates a frame containing a cycle button, text readout and text label
+	static void		createCycleButtonFrame(class CGUIObject *_parent,
+										   int _x,int _y,int _w,int _h,
+										   int _textId,
+										   int *_target,int *_data,CGUITextReadout::TextReadoutData *_readoutData);
+
 	// Creates a frame containing a slider button, readout and text label
 	static void		createSliderButtonFrame(class CGUIObject *_parent,
 											int _x,int _y,int _w,int _h,