From b3c66d530ff3825ca39eb91eb693ec12b251a5b0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 5 Jul 2005 00:12:26 +0000 Subject: [PATCH] remove ScreenBranch --- stepmania/src/ScreenBranch.cpp | 81 ---------------------------------- stepmania/src/ScreenBranch.h | 46 ------------------- stepmania/src/StepMania.vcproj | 6 --- 3 files changed, 133 deletions(-) delete mode 100644 stepmania/src/ScreenBranch.cpp delete mode 100644 stepmania/src/ScreenBranch.h diff --git a/stepmania/src/ScreenBranch.cpp b/stepmania/src/ScreenBranch.cpp deleted file mode 100644 index 820ce9b9b9..0000000000 --- a/stepmania/src/ScreenBranch.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include "global.h" -#include "ScreenBranch.h" -#include "RageLog.h" -#include "ScreenManager.h" -#include "ThemeManager.h" -#include "LuaManager.h" -#include "GameCommand.h" -#include "RageUtil.h" -#include "Command.h" - -#define CHOICES THEME->GetMetric (m_sName,"Choices") -#define CONDITION(choice) THEME->GetMetric (m_sName,"Condition"+choice) -#define NEXT_SCREEN(choice) THEME->GetMetric (m_sName,"NextScreen"+choice) - -REGISTER_SCREEN_CLASS( ScreenBranch ); -ScreenBranch::ScreenBranch( CString sClassName ) : Screen( sClassName ) -{ - LOG->Trace( "ScreenBranch::ScreenBranch()" ); - - CStringArray as; - split( CHOICES, ",", as, true ); - for( unsigned i=0; iTrace( "Branching to '%s'", sNextScreen.c_str() ); - - GameCommand mc; - mc.Load( 0, ParseCommands(sNextScreen) ); - if( mc.m_sScreen == "" ) - RageException::Throw("Metric %s::%s must set \"screen\"", - m_sName.c_str(), ("NextScreen"+m_sChoice).c_str() ); - mc.ApplyToAllPlayers(); - } - break; - } -} - -/* - * (c) 2003-2004 Chris Danford, Glenn Maynard - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/stepmania/src/ScreenBranch.h b/stepmania/src/ScreenBranch.h deleted file mode 100644 index 5b4df72ffc..0000000000 --- a/stepmania/src/ScreenBranch.h +++ /dev/null @@ -1,46 +0,0 @@ -/* ScreenBranch - Load one of several screens. */ - -#ifndef SCREEN_BRANCH_H -#define SCREEN_BRANCH_H - -#include "Screen.h" - -class ScreenBranch : public Screen -{ -public: - ScreenBranch( CString sName ); - - virtual void HandleScreenMessage( const ScreenMessage SM ); - - virtual bool UsesBackground() const { return false; } - -private: - CString m_sChoice; -}; - -#endif - -/* - * (c) 2003-2004 Chris Danford, Glenn Maynard - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index a1a2cfadfe..e395111673 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -250,12 +250,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - -