refactor to support preloading; load this (almost) like any other screen

2005-08-14 01:18:56 +00:00
parent c5c84793b0
commit 9d29f1e50f
2 changed files with 48 additions and 43 deletions
@@ -44,21 +44,7 @@ public:

 protected:
 	bool CanGoLeft() { return m_Answer > 0; }
-	bool CanGoRight()
-	{
-		switch( m_PromptType )
-		{
-		case PROMPT_OK:
-			return false;
-		case PROMPT_YES_NO:
-			return m_Answer < ANSWER_NO;
-		case PROMPT_YES_NO_CANCEL:
-			return m_Answer < ANSWER_CANCEL;
-		default:
-			ASSERT(0);
-		}
-		return false;
-	}
+	bool CanGoRight();
 	void Change( int dir );
 	void MenuLeft( PlayerNumber pn );
 	void MenuRight( PlayerNumber pn );
@@ -68,15 +54,10 @@ protected:
 	virtual void End( bool bCancelled );
 	void PositionCursor();

-	CString			m_sText;
 	BitmapText		m_textQuestion;
 	AutoActor		m_sprCursor;
 	BitmapText		m_textAnswer[NUM_PROMPT_ANSWERS];
-	PromptType		m_PromptType;
 	PromptAnswer	m_Answer;
-	void(*m_pOnYes)(void*);
-	void(*m_pOnNo)(void*);
-	void* m_pCallbackData;

 	RageSound		m_sndChange;
 };