From 42e987ef928ebeaf6d23abe3e001410801444e5b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 May 2004 00:03:35 +0000 Subject: [PATCH] style updates license update fix transitions --- stepmania/src/ScreenEditCoursesMenu.cpp | 67 ++++++++++++------------- stepmania/src/ScreenEditCoursesMenu.h | 40 ++++++++++----- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/stepmania/src/ScreenEditCoursesMenu.cpp b/stepmania/src/ScreenEditCoursesMenu.cpp index 3c502c07fb..38f569318c 100644 --- a/stepmania/src/ScreenEditCoursesMenu.cpp +++ b/stepmania/src/ScreenEditCoursesMenu.cpp @@ -1,21 +1,9 @@ #include "global.h" -/* ------------------------------------------------------------------------------ - Class: ScreenEditCoursesMenu - - Desc: The main title screen and menu. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - #include "ScreenEditCoursesMenu.h" #include "SongManager.h" #include "ScreenManager.h" #include "GameConstantsAndTypes.h" #include "RageUtil.h" -#include "PrefsManager.h" #include "GameManager.h" #include "RageLog.h" #include "GameState.h" @@ -24,13 +12,8 @@ #include "Steps.h" -// -// Defines specific to ScreenEditCoursesMenu -// -#define EXPLANATION_X THEME->GetMetricF("ScreenEditCoursesMenu","ExplanationX") -#define EXPLANATION_Y THEME->GetMetricF("ScreenEditCoursesMenu","ExplanationY") -#define EXPLANATION_TEXT THEME->GetMetric("ScreenEditCoursesMenu","ExplanationText") -#define HELP_TEXT THEME->GetMetric("ScreenEditCoursesMenu","HelpText") +#define EXPLANATION_TEXT THEME->GetMetric (m_sName,"ExplanationText") +#define HELP_TEXT THEME->GetMetric (m_sName,"HelpText") const ScreenMessage SM_RefreshSelector = (ScreenMessage)(SM_User+1); @@ -39,7 +22,7 @@ ScreenEditCoursesMenu::ScreenEditCoursesMenu( CString sName ) : ScreenWithMenuEl LOG->Trace( "ScreenEditCoursesMenu::ScreenEditCoursesMenu()" ); /* Enable all players. */ - for( int pn=0; pnm_bSideIsJoined[pn] = true; GAMESTATE->m_CurStyle = STYLE_INVALID; @@ -49,33 +32,22 @@ ScreenEditCoursesMenu::ScreenEditCoursesMenu( CString sName ) : ScreenWithMenuEl this->AddChild( &m_Selector ); + m_textExplanation.SetName( "Explanation" ); m_textExplanation.LoadFromFont( THEME->GetPathToF("Common normal") ); - m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y ); + SET_XY_AND_ON_COMMAND( m_textExplanation ); m_textExplanation.SetText( EXPLANATION_TEXT ); - m_textExplanation.SetZoom( 0.7f ); this->AddChild( &m_textExplanation ); + this->SortByDrawOrder(); + SOUND->PlayMusic( THEME->GetPathToS("ScreenEditCoursesMenu music") ); } - -ScreenEditCoursesMenu::~ScreenEditCoursesMenu() -{ - LOG->Trace( "ScreenEditCoursesMenu::~ScreenEditCoursesMenu()" ); -} - void ScreenEditCoursesMenu::DrawPrimitives() { Screen::DrawPrimitives(); } -void ScreenEditCoursesMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) -{ - LOG->Trace( "ScreenEditCoursesMenu::Input()" ); - - Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); -} - void ScreenEditCoursesMenu::HandleScreenMessage( const ScreenMessage SM ) { m_Selector.HandleScreenMessage( SM ); @@ -123,3 +95,28 @@ void ScreenEditCoursesMenu::MenuBack( PlayerNumber pn ) SOUND->StopMusic(); } + +/* + * (c) 2003-2004 Chris Danford + * 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/ScreenEditCoursesMenu.h b/stepmania/src/ScreenEditCoursesMenu.h index 6d74ab2c86..58134ba39c 100644 --- a/stepmania/src/ScreenEditCoursesMenu.h +++ b/stepmania/src/ScreenEditCoursesMenu.h @@ -1,13 +1,5 @@ -/* ------------------------------------------------------------------------------ - Class: ScreenEditCoursesMenu - - Desc: See header. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ +#ifndef SCREEN_EDIT_COURSES_MENU_H +#define SCREEN_EDIT_COURSES_MENU_H #include "ScreenWithMenuElements.h" #include "EditCoursesMenu.h" @@ -17,10 +9,8 @@ class ScreenEditCoursesMenu : public ScreenWithMenuElements { public: ScreenEditCoursesMenu( CString sName ); - virtual ~ScreenEditCoursesMenu(); virtual void DrawPrimitives(); - virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void HandleScreenMessage( const ScreenMessage SM ); private: @@ -37,5 +27,29 @@ private: BitmapText m_textExplanation; }; +#endif - +/* + * (c) 2003-2004 Chris Danford + * 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. + */