various changes from sm4 and sm-ssc (svn); see updated changelog for the full information

2010-02-18 23:17:24 -06:00
parent f9bfc80fa9
commit 5c5ef54a48
26 changed files with 436 additions and 260 deletions
@@ -43,12 +43,10 @@ void ScreenPrompt::SetPromptSettings( const RString &sText, PromptType type, Pro
 void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const RString &sText, PromptType type, PromptAnswer defaultAnswer, void(*OnYes)(void*), void(*OnNo)(void*), void* pCallbackData )
 {
 	SetPromptSettings( sText, type, defaultAnswer, OnYes, OnNo, pCallbackData );
-	
+
 	SCREENMAN->AddNewScreenToTop( "ScreenPrompt", smSendOnPop );
 }

-
-
 REGISTER_SCREEN_CLASS( ScreenPrompt );

 void ScreenPrompt::Init()