From b5f82fe4ae47a679e8251efb79f3d2ee0cf35ac5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 25 Jun 2005 09:07:11 +0000 Subject: [PATCH] remove nops, cleanup --- stepmania/src/ScreenEnding.cpp | 18 ------------------ stepmania/src/ScreenEnding.h | 3 --- 2 files changed, 21 deletions(-) diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index 8799ff424a..7ffefba2a5 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -12,19 +12,10 @@ #include "RageLog.h" #include "Style.h" #include "GameManager.h" -#include "SongUtil.h" -#include "ScreenManager.h" #include "PrefsManager.h" #include "StatsManager.h" #include "PlayerState.h" -#include "BGAnimation.h" #include "CommonMetrics.h" -#include "Foreach.h" - - -#define SCROLL_DELAY THEME->GetMetricF("ScreenEnding","ScrollDelay") -#define SCROLL_SPEED THEME->GetMetricF("ScreenEnding","ScrollSpeed") -#define TEXT_ZOOM THEME->GetMetricF("ScreenEnding","TextZoom") CString GetStatsLineTitle( PlayerNumber pn, EndingStatsLine line ) @@ -244,10 +235,6 @@ void ScreenEnding::Init() GAMESTATE->Reset(); } -ScreenEnding::~ScreenEnding() -{ -} - void ScreenEnding::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) { bool bIsTransitioning = m_In.IsTransitioning() || m_Out.IsTransitioning(); @@ -264,11 +251,6 @@ void ScreenEnding::Input( const DeviceInput& DeviceI, const InputEventType type, ScreenAttract::Input( DeviceI, type, GameI, MenuI, StyleI ); } -void ScreenEnding::HandleScreenMessage( const ScreenMessage SM ) -{ - ScreenAttract::HandleScreenMessage( SM ); -} - /* * (c) 2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/ScreenEnding.h b/stepmania/src/ScreenEnding.h index 4f886841b5..af7bbcf12c 100644 --- a/stepmania/src/ScreenEnding.h +++ b/stepmania/src/ScreenEnding.h @@ -25,10 +25,7 @@ class ScreenEnding : public ScreenAttract public: ScreenEnding( CString sName ); virtual void Init(); - ~ScreenEnding(); - virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); - void HandleScreenMessage( const ScreenMessage SM ); private: struct Line