actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-18 02:31:51 +00:00
parent 5ee52b0db5
commit 5161a06e08
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenTextEntry.cpp
+1 -19
View File
@@ -52,7 +52,6 @@ void ScreenTextEntry::TextEntry(
// add the new state onto the back of the array // add the new state onto the back of the array
ScreenTextEntry *pNewScreen = new ScreenTextEntry( ScreenTextEntry *pNewScreen = new ScreenTextEntry(
"ScreenTextEntry", "ScreenTextEntry",
smSendOnPop,
sQuestion, sQuestion,
sInitialAnswer, sInitialAnswer,
iMaxInputLength, iMaxInputLength,
@@ -62,7 +61,7 @@ void ScreenTextEntry::TextEntry(
bPassword ); bPassword );
pNewScreen->Init(); pNewScreen->Init();
SCREENMAN->ZeroNextUpdate(); SCREENMAN->ZeroNextUpdate();
SCREENMAN->PushScreen( pNewScreen, true ); SCREENMAN->PushScreen( pNewScreen, true, smSendOnPop );
} }
bool ScreenTextEntry::s_bCancelledLast = false; bool ScreenTextEntry::s_bCancelledLast = false;
@@ -78,7 +77,6 @@ bool ScreenTextEntry::s_bCancelledLast = false;
ScreenTextEntry::ScreenTextEntry( ScreenTextEntry::ScreenTextEntry(
CString sClassName, CString sClassName,
ScreenMessage smSendOnPop,
CString sQuestion, CString sQuestion,
CString sInitialAnswer, CString sInitialAnswer,
int iMaxInputLength, int iMaxInputLength,
@@ -90,7 +88,6 @@ ScreenTextEntry::ScreenTextEntry(
{ {
m_bIsTransparent = true; // draw screens below us m_bIsTransparent = true; // draw screens below us
m_smSendOnPop = smSendOnPop;
m_sQuestion = sQuestion; m_sQuestion = sQuestion;
m_sAnswer = CStringToWstring( sInitialAnswer ); m_sAnswer = CStringToWstring( sInitialAnswer );
m_iMaxInputLength = iMaxInputLength; m_iMaxInputLength = iMaxInputLength;
@@ -253,21 +250,6 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI ); ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
} }
void ScreenTextEntry::HandleScreenMessage( const ScreenMessage SM )
{
switch( SM )
{
case SM_GoToNextScreen:
if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( m_smSendOnPop );
return;
}
}
Screen::HandleScreenMessage( SM );
}
void ScreenTextEntry::MoveX( int iDir ) void ScreenTextEntry::MoveX( int iDir )
{ {
CString sKey; CString sKey;
stepmania/src/ScreenTextEntry.h
-3
View File
@@ -47,7 +47,6 @@ public:
ScreenTextEntry( ScreenTextEntry(
CString sName, CString sName,
ScreenMessage smSendOnPop,
CString sQuestion, CString sQuestion,
CString sInitialAnswer, CString sInitialAnswer,
int iMaxInputLength, int iMaxInputLength,
@@ -59,7 +58,6 @@ public:
virtual void Init(); virtual void Init();
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
virtual void HandleScreenMessage( const ScreenMessage SM );
static CString s_sLastAnswer; static CString s_sLastAnswer;
static bool s_bCancelledLast; static bool s_bCancelledLast;
@@ -83,7 +81,6 @@ protected:
void UpdateKeyboardText(); void UpdateKeyboardText();
void UpdateAnswerText(); void UpdateAnswerText();
ScreenMessage m_smSendOnPop;
CString m_sQuestion; CString m_sQuestion;
int m_iMaxInputLength; int m_iMaxInputLength;
bool m_bPassword; bool m_bPassword;