This commit is contained in:
Glenn Maynard
2006-01-24 01:00:49 +00:00
parent 6fecb35dfa
commit 63368f99da
3 changed files with 11 additions and 20 deletions
+1 -9
View File
@@ -38,12 +38,6 @@ void ScreenTestInput::Init()
} }
ScreenTestInput::~ScreenTestInput()
{
LOG->Trace( "ScreenTestInput::~ScreenTestInput()" );
}
static LocalizedString CONTROLLER ( "ScreenTestInput", "Controller" ); static LocalizedString CONTROLLER ( "ScreenTestInput", "Controller" );
static LocalizedString SECONDARY ( "ScreenTestInput", "secondary" ); static LocalizedString SECONDARY ( "ScreenTestInput", "secondary" );
static LocalizedString NOT_MAPPED ( "ScreenTestInput", "not mapped" ); static LocalizedString NOT_MAPPED ( "ScreenTestInput", "not mapped" );
@@ -120,7 +114,6 @@ void ScreenTestInput::Input( const InputEventPlus &input )
{ {
case IET_FIRST_PRESS: case IET_FIRST_PRESS:
case IET_RELEASE: case IET_RELEASE:
{
switch( input.type ) switch( input.type )
{ {
case IET_FIRST_PRESS: sMessage += "Pressed"; break; case IET_FIRST_PRESS: sMessage += "Pressed"; break;
@@ -128,7 +121,6 @@ void ScreenTestInput::Input( const InputEventPlus &input )
} }
MESSAGEMAN->Broadcast( sMessage ); MESSAGEMAN->Broadcast( sMessage );
} }
}
if( input.type != IET_FIRST_PRESS && input.type != IET_SLOW_REPEAT ) if( input.type != IET_FIRST_PRESS && input.type != IET_SLOW_REPEAT )
return; // ignore return; // ignore
@@ -143,7 +135,7 @@ void ScreenTestInput::MenuStart( PlayerNumber pn )
void ScreenTestInput::MenuBack( PlayerNumber pn ) void ScreenTestInput::MenuBack( PlayerNumber pn )
{ {
if(!IsTransitioning()) if( !IsTransitioning() )
{ {
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
StartTransitioningScreen( SM_GoToPrevScreen ); StartTransitioningScreen( SM_GoToPrevScreen );
-1
View File
@@ -11,7 +11,6 @@ class ScreenTestInput : public ScreenWithMenuElements
{ {
public: public:
virtual void Init(); virtual void Init();
virtual ~ScreenTestInput();
virtual void Update( float fDelta ); virtual void Update( float fDelta );
virtual void Input( const InputEventPlus &input ); virtual void Input( const InputEventPlus &input );