From a584f1b5be8d82a5429b86773bc7f9d363dd9d31 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Mar 2007 22:04:28 +0000 Subject: [PATCH] rename EndScreen; that's a virtual from Screen. Why is there no way to get a warning when virtual methods are overloaded without specifying "virtual"? --- stepmania/src/ScreenEvaluation.cpp | 6 +++--- stepmania/src/ScreenEvaluation.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 212fd94ef1..8aae564795 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -765,7 +765,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) { if( SM == SM_MenuTimer ) { - EndScreen(); + HandleMenuStart(); } else if( SM == SM_PlayCheer ) { @@ -805,10 +805,10 @@ void ScreenEvaluation::MenuStart( const InputEventPlus &input ) { m_soundStart.Play(); - EndScreen(); + HandleMenuStart(); } -void ScreenEvaluation::EndScreen() +void ScreenEvaluation::HandleMenuStart() { FOREACH_PlayerNumber( p ) m_Grades[p].SettleImmediately(); diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 93bb17dcfa..25a606813e 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -51,7 +51,7 @@ protected: virtual bool GenericTweenOn() const { return true; } virtual bool GenericTweenOff() const { return true; } - void EndScreen(); + void HandleMenuStart(); bool m_bSummary;