From 1fe01e6aa1e101fa47e68acc7c7e8e00ea0eb273 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 13 Jul 2005 20:26:41 +0000
Subject: [PATCH] derive from SWME to eliminate background and common
 transitions

---
 stepmania/src/ScreenPrompt.cpp | 21 ++++-----------------
 stepmania/src/ScreenPrompt.h   |  9 ++-------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index 4b174a6e80..d13287a9cb 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -27,18 +27,14 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
 
 //REGISTER_SCREEN_CLASS( ScreenPrompt );
 ScreenPrompt::ScreenPrompt( const CString &sScreenName ):
-	Screen( sScreenName )
+	ScreenWithMenuElements( sScreenName )
 {
 	m_bIsTransparent = true;	// draw screens below us
 }
 
 void ScreenPrompt::Init()
 {
-	Screen::Init();
-
-	m_Background.LoadFromAniDir( THEME->GetPathB(m_sName,"background") );
-	m_Background.PlayCommand("On");
-	this->AddChild( &m_Background );
+	ScreenWithMenuElements::Init();
 
 	m_textQuestion.LoadFromFont( THEME->GetPathF(m_sName,"question") );
 	m_textQuestion.SetName( "Question" );
@@ -54,15 +50,6 @@ void ScreenPrompt::Init()
 		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 );
 }
 
@@ -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 )
@@ -147,7 +134,7 @@ void ScreenPrompt::HandleScreenMessage( const ScreenMessage SM )
 		break;
 	}
 
-	Screen::HandleScreenMessage( SM );
+	ScreenWithMenuElements::HandleScreenMessage( SM );
 }
 
 void ScreenPrompt::Change( int dir )
diff --git a/stepmania/src/ScreenPrompt.h b/stepmania/src/ScreenPrompt.h
index 8c0fc0d6b3..24edd7298f 100644
--- a/stepmania/src/ScreenPrompt.h
+++ b/stepmania/src/ScreenPrompt.h
@@ -3,7 +3,7 @@
 #ifndef SCREEN_PROMPT_H
 #define SCREEN_PROMPT_H
 
-#include "Screen.h"
+#include "ScreenWithMenuElements.h"
 #include "BitmapText.h"
 #include "Transition.h"
 #include "Quad.h"
@@ -26,7 +26,7 @@ enum PromptAnswer
 	NUM_PROMPT_ANSWERS
 };
 
-class ScreenPrompt : public Screen
+class ScreenPrompt : public ScreenWithMenuElements
 {
 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 );
@@ -75,7 +75,6 @@ protected:
 	void PositionCursor();
 
 	CString			m_sText;
-	BGAnimation		m_Background;
 	BitmapText		m_textQuestion;
 	AutoActor		m_sprCursor;
 	BitmapText		m_textAnswer[NUM_PROMPT_ANSWERS];
@@ -86,10 +85,6 @@ protected:
 	void(*m_pOnNo)(void*);
 	void* m_pCallbackData;
 
-	Transition		m_In;
-	Transition		m_Out;
-	Transition		m_Cancel;
-
 	RageSound		m_sndChange;
 };