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

derive from SWME to eliminate background and common transitions

Browse Source
This commit is contained in:
Chris Danford
2005-07-13 20:26:41 +00:00
parent 19b271f2ed
commit 1fe01e6aa1
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenPrompt.cpp
+4 -17
View File
@@ -27,18 +27,14 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
//REGISTER_SCREEN_CLASS( ScreenPrompt ); //REGISTER_SCREEN_CLASS( ScreenPrompt );
ScreenPrompt::ScreenPrompt( const CString &sScreenName ): ScreenPrompt::ScreenPrompt( const CString &sScreenName ):
Screen( sScreenName ) ScreenWithMenuElements( sScreenName )
{ {
m_bIsTransparent = true; // draw screens below us m_bIsTransparent = true; // draw screens below us
} }
void ScreenPrompt::Init() void ScreenPrompt::Init()
{ {
Screen::Init(); ScreenWithMenuElements::Init();
m_Background.LoadFromAniDir( THEME->GetPathB(m_sName,"background") );
m_Background.PlayCommand("On");
this->AddChild( &m_Background );
m_textQuestion.LoadFromFont( THEME->GetPathF(m_sName,"question") ); m_textQuestion.LoadFromFont( THEME->GetPathF(m_sName,"question") );
m_textQuestion.SetName( "Question" ); m_textQuestion.SetName( "Question" );
@@ -54,15 +50,6 @@ void ScreenPrompt::Init()
this->AddChild( &m_textAnswer[i] ); this->AddChild( &m_textAnswer[i] );
} }
m_In.Load( THEME->GetPathB(m_sName,"in") );
this->AddChild( &m_In );
m_Out.Load( THEME->GetPathB(m_sName,"out") );
this->AddChild( &m_Out );
m_Cancel.Load( THEME->GetPathB(m_sName,"cancel") );
this->AddChild( &m_Cancel );
m_sndChange.Load( THEME->GetPathS(m_sName,"change"), true ); m_sndChange.Load( THEME->GetPathS(m_sName,"change"), true );
} }
@@ -126,7 +113,7 @@ void ScreenPrompt::Input( const DeviceInput& DeviceI, const InputEventType type,
} }
} }
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); ScreenWithMenuElements::Input( DeviceI, type, GameI, MenuI, StyleI );
} }
void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM ) void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM )
@@ -147,7 +134,7 @@ void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM )
break; break;
} }
Screen::HandleScreenMessage( SM ); ScreenWithMenuElements::HandleScreenMessage( SM );
} }
void ScreenPrompt::Change( int dir ) void ScreenPrompt::Change( int dir )
stepmania/src/ScreenPrompt.h
+2 -7
View File
@@ -3,7 +3,7 @@
#ifndef SCREEN_PROMPT_H #ifndef SCREEN_PROMPT_H
#define SCREEN_PROMPT_H #define SCREEN_PROMPT_H
#include "Screen.h" #include "ScreenWithMenuElements.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "Transition.h" #include "Transition.h"
#include "Quad.h" #include "Quad.h"
@@ -26,7 +26,7 @@ enum PromptAnswer
NUM_PROMPT_ANSWERS NUM_PROMPT_ANSWERS
}; };
class ScreenPrompt : public Screen class ScreenPrompt : public ScreenWithMenuElements
{ {
public: public:
static void Prompt( ScreenMessage smSendOnPop, const CString &sText, PromptType type = PROMPT_OK, PromptAnswer defaultAnswer = ANSWER_NO, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL ); static void Prompt( ScreenMessage smSendOnPop, const CString &sText, PromptType type = PROMPT_OK, PromptAnswer defaultAnswer = ANSWER_NO, void(*OnYes)(void*) = NULL, void(*OnNo)(void*) = NULL, void* pCallbackData = NULL );
@@ -75,7 +75,6 @@ protected:
void PositionCursor(); void PositionCursor();
CString m_sText; CString m_sText;
BGAnimation m_Background;
BitmapText m_textQuestion; BitmapText m_textQuestion;
AutoActor m_sprCursor; AutoActor m_sprCursor;
BitmapText m_textAnswer[NUM_PROMPT_ANSWERS]; BitmapText m_textAnswer[NUM_PROMPT_ANSWERS];
@@ -86,10 +85,6 @@ protected:
void(*m_pOnNo)(void*); void(*m_pOnNo)(void*);
void* m_pCallbackData; void* m_pCallbackData;
Transition m_In;
Transition m_Out;
Transition m_Cancel;
RageSound m_sndChange; RageSound m_sndChange;
}; };