cleanup
This commit is contained in:
@@ -1268,11 +1268,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
|
||||
}
|
||||
}
|
||||
|
||||
void ScreenEvaluation::DrawPrimitives()
|
||||
{
|
||||
ScreenWithMenuElements::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
// LOG->Trace( "ScreenEvaluation::Input()" );
|
||||
|
||||
@@ -35,7 +35,6 @@ public:
|
||||
ScreenEvaluation( CString sClassName );
|
||||
virtual void Init();
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -512,11 +512,6 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime )
|
||||
Screen::Update( fDeltaTime );
|
||||
}
|
||||
|
||||
void ScreenEz2SelectMusic::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn )
|
||||
{
|
||||
if(USE_MODE_SWITCHER == 1)
|
||||
|
||||
@@ -16,7 +16,6 @@ class ScreenEz2SelectMusic : public ScreenWithMenuElements
|
||||
public:
|
||||
ScreenEz2SelectMusic( CString sName );
|
||||
virtual void Init();
|
||||
virtual void DrawPrimitives();
|
||||
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
|
||||
@@ -109,16 +109,6 @@ void ScreenEz2SelectPlayer::Update( float fDeltaTime )
|
||||
Screen::Update( fDeltaTime );
|
||||
}
|
||||
|
||||
/************************************
|
||||
DrawPrimitives
|
||||
Desc: Draws the screen =P
|
||||
************************************/
|
||||
|
||||
void ScreenEz2SelectPlayer::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
/************************************
|
||||
Input
|
||||
Desc: Handles player input.
|
||||
|
||||
@@ -16,7 +16,6 @@ public:
|
||||
|
||||
/* Public Function Prototypes */
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -492,12 +492,6 @@ void ScreenGameplayMultiplayer::Update( float fDeltaTime )
|
||||
}
|
||||
|
||||
|
||||
void ScreenGameplayMultiplayer::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
|
||||
void ScreenGameplayMultiplayer::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
//LOG->Trace( "ScreenGameplayMultiplayer::Input()" );
|
||||
|
||||
@@ -47,7 +47,6 @@ public:
|
||||
virtual ~ScreenGameplayMultiplayer();
|
||||
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -140,11 +140,6 @@ void ScreenMapControllers::Update( float fDeltaTime )
|
||||
}
|
||||
|
||||
|
||||
void ScreenMapControllers::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
/* Note that this isn't necessarily correct. For example, JOY_LEFT might actually be
|
||||
* a D-pad and not an axis. All this is actually doing is giving priority to some
|
||||
* inputs over others; this function is unsuitable for other use. */
|
||||
|
||||
@@ -18,7 +18,6 @@ public:
|
||||
virtual ~ScreenMapControllers();
|
||||
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -469,11 +469,6 @@ void ScreenOptions::Update( float fDeltaTime )
|
||||
ScreenWithMenuElements::Update( fDeltaTime );
|
||||
}
|
||||
|
||||
void ScreenOptions::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
/* Allow input when transitioning in (m_In.IsTransitioning()), but ignore it
|
||||
|
||||
@@ -29,7 +29,6 @@ public:
|
||||
void InitMenu( InputMode im, const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands );
|
||||
virtual ~ScreenOptions();
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -179,11 +179,6 @@ void ScreenSelectCharacter::Input( const DeviceInput& DeviceI, const InputEventT
|
||||
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); // default input handler
|
||||
}
|
||||
|
||||
void ScreenSelectCharacter::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
switch( SM )
|
||||
|
||||
@@ -20,7 +20,6 @@ public:
|
||||
virtual void Init();
|
||||
virtual ~ScreenSelectCharacter();
|
||||
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -147,11 +147,6 @@ void ScreenSelectGroup::Input( const DeviceInput& DeviceI, const InputEventType
|
||||
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); // default input handler
|
||||
}
|
||||
|
||||
void ScreenSelectGroup::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM )
|
||||
{
|
||||
switch( SM )
|
||||
|
||||
@@ -17,7 +17,6 @@ public:
|
||||
ScreenSelectGroup( CString sName );
|
||||
virtual void Init();
|
||||
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
@@ -108,11 +108,6 @@ void ScreenSetTime::Update( float fDelta )
|
||||
m_textValue[day].SetText( ssprintf("%02d",now.tm_mday) );
|
||||
}
|
||||
|
||||
void ScreenSetTime::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenSetTime::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
if( type != IET_FIRST_PRESS && type != IET_SLOW_REPEAT )
|
||||
|
||||
@@ -22,7 +22,6 @@ public:
|
||||
virtual void Init();
|
||||
|
||||
virtual void Update( float fDelta );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
|
||||
virtual void MenuUp( PlayerNumber pn );
|
||||
|
||||
@@ -113,11 +113,6 @@ void ScreenTestInput::Update( float fDeltaTime )
|
||||
}
|
||||
|
||||
|
||||
void ScreenTestInput::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenTestInput::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
if( type != IET_FIRST_PRESS && type != IET_SLOW_REPEAT )
|
||||
|
||||
@@ -14,7 +14,6 @@ public:
|
||||
virtual void Init();
|
||||
virtual ~ScreenTestInput();
|
||||
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Update( float fDelta );
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
@@ -88,11 +88,6 @@ void ScreenTestLights::Update( float fDeltaTime )
|
||||
}
|
||||
|
||||
|
||||
void ScreenTestLights::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenTestLights::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
if( type != IET_FIRST_PRESS && type != IET_SLOW_REPEAT )
|
||||
|
||||
@@ -12,7 +12,6 @@ public:
|
||||
virtual void Init();
|
||||
virtual ~ScreenTestLights();
|
||||
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Update( float fDelta );
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
@@ -203,16 +203,6 @@ void ScreenTextEntry::PositionCursor()
|
||||
m_sprCursor->SetXY( bt.GetX(), bt.GetY() );
|
||||
}
|
||||
|
||||
void ScreenTextEntry::Update( float fDeltaTime )
|
||||
{
|
||||
Screen::Update( fDeltaTime );
|
||||
}
|
||||
|
||||
void ScreenTextEntry::DrawPrimitives()
|
||||
{
|
||||
Screen::DrawPrimitives();
|
||||
}
|
||||
|
||||
void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
|
||||
{
|
||||
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Cancel.IsTransitioning() )
|
||||
|
||||
@@ -58,8 +58,6 @@ public:
|
||||
~ScreenTextEntry();
|
||||
virtual void Init();
|
||||
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
|
||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user