actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove ScreenGameOver code, replace with ScreenAttract

Browse Source
This commit is contained in:
Chris Danford
2004-12-09 04:20:09 +00:00
parent 6558f6f7de
commit 08964e340b
6 changed files with 5 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -3610,6 +3610,7 @@ TextsZoom=0.5
NextScreen=ScreenRanking
[ScreenGameOver]
Class=ScreenAttract
NextScreen=ScreenCompany
[ScreenSelectCharacter]
stepmania/src/Makefile.am
+1 -1
View File
@@ -30,7 +30,7 @@ ScreenEditCoursesMenu.cpp ScreenEditCoursesMenu.h EditCoursesSongMenu.cpp EditCo
ScreenEditMenu.cpp ScreenEditMenu.h ScreenEnding.cpp ScreenEnding.h \
ScreenEndlessBreak.cpp ScreenEndlessBreak.h ScreenEvaluation.cpp ScreenEvaluation.h ScreenExit.cpp ScreenExit.h ScreenNetEvaluation.cpp ScreenNetEvaluation.h \
ScreenNetSelectMusic.cpp ScreenNetSelectMusic.h ScreenNetSelectBase.cpp ScreenNetSelectBase.h ScreenNetRoom.cpp ScreenNetRoom.h ScreenEz2SelectMusic.cpp ScreenEz2SelectMusic.h ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h \
ScreenGameOver.cpp ScreenGameOver.h ScreenGameplay.cpp ScreenGameplay.h ScreenHowToPlay.cpp ScreenHowToPlay.h \
ScreenGameplay.cpp ScreenGameplay.h ScreenHowToPlay.cpp ScreenHowToPlay.h \
ScreenInstructions.cpp ScreenInstructions.h \
ScreenJukebox.cpp ScreenJukebox.h \
ScreenJukeboxMenu.cpp ScreenJukeboxMenu.h ScreenLogo.cpp ScreenLogo.h ScreenMapControllers.cpp ScreenMapControllers.h \
stepmania/src/ScreenGameOver.cpp
-82
View File
@@ -1,82 +0,0 @@
#include "global.h"
#include "ScreenGameOver.h"
#include "ScreenManager.h"
#include "AnnouncerManager.h"
#include "GameSoundManager.h"
#include "ThemeManager.h"
const ScreenMessage SM_StartFadingOut = ScreenMessage(SM_User + 1);
const ScreenMessage SM_PlayAnnouncer = ScreenMessage(SM_User + 3);
#define NEXT_SCREEN THEME->GetMetric("ScreenGameOver","NextScreen")
REGISTER_SCREEN_CLASS( ScreenGameOver );
ScreenGameOver::ScreenGameOver( CString sName ) : Screen( sName )
{
m_Background.LoadFromAniDir( THEME->GetPathToB("ScreenGameOver background") );
this->AddChild( &m_Background );
m_In.Load( THEME->GetPathToB("ScreenGameOver in") );
this->AddChild( &m_In );
m_Out.Load( THEME->GetPathToB("ScreenGameOver out") );
this->AddChild( &m_Out );
SOUND->PlayMusic( THEME->GetPathToS("ScreenGameOver music") );
m_In.StartTransitioning( SM_PlayAnnouncer );
this->PostScreenMessage( SM_StartFadingOut, m_Background.GetLengthSeconds() );
}
void ScreenGameOver::HandleScreenMessage( const ScreenMessage SM )
{
switch( SM )
{
case SM_PlayAnnouncer:
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("game over") );
break;
case SM_StartFadingOut:
m_Out.StartTransitioning( SM_GoToNextScreen );
break;
case SM_GoToNextScreen:
SCREENMAN->SetNewScreen( NEXT_SCREEN );
break;
}
}
void ScreenGameOver::MenuStart( PlayerNumber pn )
{
if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
return;
this->ClearMessageQueue();
this->PostScreenMessage( SM_StartFadingOut, 0 );
}
/*
* (c) 2002-2003 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.
*/
stepmania/src/ScreenGameOver.h
-50
View File
@@ -1,50 +0,0 @@
#ifndef SCREEN_GAME_OVER_H
#define SCREEN_GAME_OVER_H
#include "Screen.h"
#include "BGAnimation.h"
#include "Transition.h"
class ScreenGameOver : public Screen
{
public:
ScreenGameOver( CString sName );
virtual void HandleScreenMessage( const ScreenMessage SM );
virtual void MenuStart( PlayerNumber pn );
private:
Transition m_In;
Transition m_Out;
BGAnimation m_Background;
};
#endif
/*
* (c) 2002-2003 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.
*/
stepmania/src/StepMania.dsp
+3 -11
View File
@@ -1,5 +1,5 @@
# Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 60000
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
@@ -62,7 +62,7 @@ IntDir=.\../Debug6
TargetDir=\stepmania\stepmania\Program
TargetName=StepMania-debug
SOURCE="$(InputPath)"
PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
# End Special Build Tool
@@ -99,7 +99,7 @@ IntDir=.\../Release6
TargetDir=\stepmania\stepmania\Program
TargetName=StepMania
SOURCE="$(InputPath)"
PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PreLink_Cmds=archutils\Win32\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
# End Special Build Tool
@@ -2484,14 +2484,6 @@ SOURCE=.\ScreenEz2SelectPlayer.h
# End Source File
# Begin Source File
SOURCE=.\ScreenGameOver.cpp
# End Source File
# Begin Source File
SOURCE=.\ScreenGameOver.h
# End Source File
# Begin Source File
SOURCE=.\ScreenGameplay.cpp
# End Source File
# Begin Source File
stepmania/src/StepMania.vcproj
-6
View File
@@ -262,12 +262,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File
RelativePath="ScreenEz2SelectPlayer.h">
</File>
<File
RelativePath="ScreenGameOver.cpp">
</File>
<File
RelativePath="ScreenGameOver.h">
</File>
<File
RelativePath="ScreenGameplay.cpp">
</File>