From a5d574e414f28bf791c77063be85b4495ebd7093 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 15 Jul 2005 21:36:11 +0000 Subject: [PATCH] incomplete for almost two years; a reasonable grace period, I hope :) --- stepmania/src/ScreenEndlessBreak.cpp | 120 --------------------------- stepmania/src/ScreenEndlessBreak.h | 62 -------------- 2 files changed, 182 deletions(-) delete mode 100644 stepmania/src/ScreenEndlessBreak.cpp delete mode 100644 stepmania/src/ScreenEndlessBreak.h diff --git a/stepmania/src/ScreenEndlessBreak.cpp b/stepmania/src/ScreenEndlessBreak.cpp deleted file mode 100644 index dde7535ac1..0000000000 --- a/stepmania/src/ScreenEndlessBreak.cpp +++ /dev/null @@ -1,120 +0,0 @@ -#include "global.h" -#include "RageLog.h" -#include "ScreenManager.h" -#include "ScreenEndlessBreak.h" -#include "ScreenDimensions.h" - -//TODO:: Add scripting support - -REGISTER_SCREEN_CLASS( ScreenEndlessBreak ); -ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName ) -{ - LOG->Trace("ScreenEndlessBreak()"); - ASSERT(GAMESTATE->GetNumPlayersEnabled() > 0); // This should never happen.. but just in case - PostScreenMessage( SM_BreakInitiated, 0 ); - - if( (int)PREFSMAN->m_ShowDancingCharacters != 0 ) - { - if( GAMESTATE->GetNumPlayersEnabled() == 1 ) - if( GAMESTATE->m_pCurCharacters[0] != NULL ) - m_sprBreakPicture.LoadTABreakFromCharacter( GAMESTATE->m_pCurCharacters[0] ); - else - m_sprBreakPicture.Load( THEME->GetPathG("Common","fallback takingabreak") ); - else if( GAMESTATE->GetNumPlayersEnabled() > 1 ) // More than 1 player is present. - { - PlayerNumber pn; - do - { - pn = (PlayerNumber)(rand()%NUM_PLAYERS); - if( GAMESTATE->IsPlayerEnabled(pn) && (GAMESTATE->m_pCurCharacters[pn] != NULL) ) - { - m_sprBreakPicture.LoadTABreakFromCharacter( GAMESTATE->m_pCurCharacters[pn] ); - break; - } - } - while( !GAMESTATE->IsPlayerEnabled(pn) ); - } - } - else // Characters not enabled. - m_sprBreakPicture.Load( THEME->GetPathG("Common","fallback takingabreak") ); - m_sprBreakPicture.SetX( SCREEN_CENTER_X ); - m_sprBreakPicture.SetY( SCREEN_CENTER_Y ); - this->AddChild(&m_sprBreakPicture); - - // Set up our countdown clock. - m_fCountdownSecs = (float)(PREFSMAN->m_iEndlessBreakLength*60); // Stored in minutes. - - //BitmapText stuff - m_textTimeRemaining.LoadFromFont( THEME->GetPathF("Common","normal") ); - m_textTimeRemaining.SetText( SecondsToMMSSMsMs(m_fCountdownSecs) ); - m_textTimeRemaining.SetX( SCREEN_CENTER_X ); - m_textTimeRemaining.SetY( SCREEN_CENTER_Y ); - - //Transition stuff - m_In.Load( THEME->GetPathB("ScreenEndlessBreak","In") ); - this->AddChild(&m_In); - m_In.StartTransitioning(); - m_Out.Load( THEME->GetPathB("ScreenEndlessBreak","Out") ); - this->AddChild(&m_Out); - m_bExiting = false; -} - -void ScreenEndlessBreak::Update(float fDeltaTime) -{ - m_textTimeRemaining.SetText( SecondsToMMSSMsMs(m_fCountdownSecs) ); - if( !m_bExiting ) - if(m_fCountdownSecs <= 0) - { - m_bExiting = true; - SCREENMAN->PopTopScreen(SM_BreakCompleted); // Destroy this screen and let ScreenGameplay get the message. - m_Out.StartTransitioning(); - } - else - //m_fCountdownSecs--; - m_fCountdownSecs = (m_fCountdownSecs - fDeltaTime); - Screen::Update( fDeltaTime ); -} - -void ScreenEndlessBreak::DrawPrimitives() -{ - Screen::DrawPrimitives(); // Draw all other elements below our TakingABreak pic. - m_sprBreakPicture.Draw(); - m_textTimeRemaining.Draw(); // Draw the time remaining on top of everything. -} - -void ScreenEndlessBreak::Input(const DeviceInput &DeviceI, const InputEventType type, const GameInput *GameI, const MenuInput &MenuI, const StyleInput &StyleI) -{ - //Why is this not working..? - switch( MenuI.button ) - { - case MENU_BUTTON_START: m_fCountdownSecs = 0; break; - } - //Compiler bitching over this.. - //Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); -} - -/* - * (c) 2001-2003 Kevin Slaughter - * 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/ScreenEndlessBreak.h b/stepmania/src/ScreenEndlessBreak.h deleted file mode 100644 index f514fad23b..0000000000 --- a/stepmania/src/ScreenEndlessBreak.h +++ /dev/null @@ -1,62 +0,0 @@ -/* ScreenEndlessBreak - Break periods during endless mode. */ - -#ifndef SCREENENDLESSBREAK_H -#define SCREENENDLESSBREAK_H - -#include "Screen.h" -#include "PrefsManager.h" -#include "Banner.h" -#include "Character.h" -#include "GameState.h" -#include "ThemeManager.h" -#include "BitmapText.h" -#include "Transition.h" - -// Sent to ScreenGameplay so it can keep all it's data ready for when we resume play. -AutoScreenMessage( SM_BreakInitiated ) -AutoScreenMessage( SM_BreakCompleted ) - -class ScreenEndlessBreak : public Screen -{ -public: - ScreenEndlessBreak( CString sName ); - - virtual void DrawPrimitives(); - virtual void Update(float fDeltaTime); - virtual void Input(const DeviceInput &DeviceI, const InputEventType type, const GameInput *GameI, const MenuInput &MenuI, const StyleInput &StyleI); - -private: - Banner m_sprBreakPicture; - BitmapText m_textTimeRemaining; - float m_fCountdownSecs; - Transition m_In; - Transition m_Out; - bool m_bExiting; -}; -#endif - -/* - * (c) 2001-2003 Kevin Slaughter - * 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. - */ -