diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 01b48a273a..dbf47c93cf 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3832,7 +3832,7 @@ BookkeepingDefault= Bookkeeping,1=screen,ScreenBookkeeping;name,Bookkeeping Clear Bookkeeping Data=1,together Clear Bookkeeping DataDefault= -Clear Bookkeeping Data,1=screen,ScreenClearBookkeepingData;name,ClearBookkeepingData +Clear Bookkeeping Data,1=ClearBookkeepingData;name,ClearBookkeepingData Center Image=1,together Center ImageDefault= Center Image,1=screen,ScreenCenterImage;name,CenterImage @@ -3844,16 +3844,16 @@ Config Key/Joy MappingsDefault= Config Key/Joy Mappings,1=screen,ScreenMapControllers;name,KeyJoyMappings Download Machine Stats=1,together Download Machine StatsDefault= -Download Machine Stats,1=screen,ScreenDownloadMachineStats;name,DownloadMachineStats +Download Machine Stats,1=DownloadMachineStats;name,DownloadMachineStats;screen,ScreenOptionsMenu Clear Machine Stats=1,together Clear Machine StatsDefault= -Clear Machine Stats,1=screen,ScreenClearMachineStats;name,ClearMachineStats +Clear Machine Stats,1=ClearMachineStats;name,ClearMachineStats;screen,ScreenOptionsMenu Input Options=1,together Input OptionsDefault= Input Options,1=screen,ScreenInputOptions;name,InputOptions Insert Credit=1,together Insert CreditDefault= -Insert Credit,1=screen,ScreenInsertCredit;name,InsertCredit +Insert Credit,1=InsertCredit;name,InsertCredit Gameplay Options=1,together Gameplay OptionsDefault= Gameplay Options,1=screen,ScreenGameplayOptions;name,GameplayOptions @@ -3874,7 +3874,7 @@ Reload Songs/CoursesDefault= Reload Songs/Courses,1=screen,ScreenReloadSongs;name,ReloadSongs Reset To Defaults=1,together Reset To DefaultsDefault= -Reset To Defaults,1=screen,ScreenResetToDefaults;name,ResetToDefaults +Reset To Defaults,1=ResetToFactoryDefaults;name,ResetToDefaults;screen,ScreenOptionsMenu Test Input=1,together Test InputDefault= Test Input,1=screen,ScreenTestInput;name,TestInput diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 9c95b608d9..bd464de177 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -19,6 +19,7 @@ #include "Foreach.h" #include "Command.h" #include "arch/Dialog/Dialog.h" +#include "Bookkeeper.h" void GameCommand::Init() { @@ -39,6 +40,12 @@ void GameCommand::Init() m_pTrail = NULL; m_pCharacter = NULL; m_SortOrder = SORT_INVALID; + + m_bClearBookkeepingData = false; + m_bClearMachineStats = false; + m_bDownloadMachineStats = false; + m_bInsertCredit = false; + m_bResetToFactoryDefaults = false; } bool CompareSongOptions( const SongOptions &so1, const SongOptions &so2 ); @@ -223,6 +230,27 @@ void GameCommand::Load( int iIndex, const Commands& cmds ) m_bInvalid |= true; } } + + else if( sName == "ClearBookkeepingData" ) + { + m_bClearBookkeepingData = true; + } + else if( sName == "ClearMachineStats" ) + { + m_bClearMachineStats = true; + } + else if( sName == "DownloadMachineStats" ) + { + m_bDownloadMachineStats = true; + } + else if( sName == "InsertCredit" ) + { + m_bInsertCredit = true; + } + else if( sName == "ResetToFactoryDefaults" ) + { + m_bResetToFactoryDefaults = true; + } else { @@ -502,6 +530,57 @@ void GameCommand::Apply( PlayerNumber pn ) const if( m_SortOrder != SORT_INVALID ) GAMESTATE->m_SortOrder = m_SortOrder; + if( m_bClearBookkeepingData ) + { + BOOKKEEPER->ClearAll(); + BOOKKEEPER->WriteToDisk(); + SCREENMAN->SystemMessage( "Bookkeeping data cleared." ); + } + if( m_bClearMachineStats ) + { + Profile* pProfile = PROFILEMAN->GetMachineProfile(); + // don't reset the Guid + CString sGuid = pProfile->m_sGuid; + pProfile->InitAll(); + pProfile->m_sGuid = sGuid; + PROFILEMAN->SaveMachineProfile(); + SCREENMAN->SystemMessage( "Machine stats cleared." ); + } + if( m_bDownloadMachineStats ) + { + MEMCARDMAN->TryMountAllCards(); + + FOREACH_PlayerNumber( pn ) + { + if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY ) + continue; // skip + + CString sDir = MEM_CARD_MOUNT_POINT[pn]; + sDir += "MachineProfile/"; + + + bool bSaved = PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData ); + if( bSaved ) + SCREENMAN->SystemMessage( ssprintf("Machine stats saved to P%d card.",pn+1) ); + else + SCREENMAN->SystemMessage( ssprintf("Error saving stats to P%d card.",pn+1) ); + return; + } + + MEMCARDMAN->FlushAndReset(); + + SCREENMAN->SystemMessage( "Stats not saved - No memory cards ready." ); + } + if( m_bInsertCredit ) + { + InsertCredit(); + } + if( m_bResetToFactoryDefaults ) + { + PREFSMAN->ResetToFactoryDefaults(); + SCREENMAN->SystemMessage( "All options reset to factory defaults." ); + } + // HACK: Set life type to BATTERY just once here so it happens once and // we don't override the user's changes if they back out. if( GAMESTATE->m_PlayMode == PLAY_MODE_ONI && GAMESTATE->m_PlayMode != OldPlayMode ) diff --git a/stepmania/src/GameCommand.h b/stepmania/src/GameCommand.h index 5326458c77..dbb6efcc97 100644 --- a/stepmania/src/GameCommand.h +++ b/stepmania/src/GameCommand.h @@ -49,6 +49,12 @@ struct GameCommand // used in SelectMode std::map m_SetEnv; CString m_sSongGroup; SortOrder m_SortOrder; + + bool m_bClearBookkeepingData; + bool m_bClearMachineStats; + bool m_bDownloadMachineStats; + bool m_bInsertCredit; + bool m_bResetToFactoryDefaults; }; #endif diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index a621935a94..d049279522 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -25,14 +25,13 @@ Screen.cpp Screen.h ScreenAttract.cpp ScreenAttract.h \ ScreenBookkeeping.cpp ScreenBookkeeping.h ScreenBranch.cpp ScreenBranch.h \ ScreenCenterImage.cpp ScreenCenterImage.h ScreenCredits.cpp ScreenCredits.h \ ScreenDemonstration.cpp ScreenDemonstration.h ScreenDimensions.h \ -ScreenClearBookkeepingData.cpp ScreenClearBookkeepingData.h ScreenClearMachineStats.cpp ScreenClearMachineStats.h \ -ScreenDownloadMachineStats.cpp ScreenDownloadMachineStats.h ScreenEdit.cpp ScreenEdit.h \ +ScreenEdit.cpp ScreenEdit.h \ ScreenEditCoursesMenu.cpp ScreenEditCoursesMenu.h EditCoursesSongMenu.cpp EditCoursesSongMenu.h \ 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 \ -ScreenInstructions.cpp ScreenInstructions.h ScreenInsertCredit.cpp ScreenInsertCredit.h \ +ScreenInstructions.cpp ScreenInstructions.h \ ScreenJukebox.cpp ScreenJukebox.h \ ScreenJukeboxMenu.cpp ScreenJukeboxMenu.h ScreenLogo.cpp ScreenLogo.h ScreenMapControllers.cpp ScreenMapControllers.h \ ScreenMessage.h ScreenMiniMenu.cpp ScreenMiniMenu.h ScreenMusicScroll.cpp ScreenMusicScroll.h \ @@ -40,7 +39,7 @@ ScreenNameEntry.cpp ScreenNameEntry.h ScreenNameEntryTraditional.cpp ScreenNameE ScreenOptions.cpp ScreenOptions.h ScreenOptionsMaster.cpp ScreenOptionsMaster.h \ ScreenOptionsMasterPrefs.cpp ScreenOptionsMasterPrefs.h ScreenPackages.cpp ScreenPackages.h ScreenPlayerOptions.cpp ScreenPlayerOptions.h ScreenNetworkOptions.h \ ScreenNetworkOptions.cpp ScreenProfileOptions.cpp ScreenProfileOptions.h ScreenPrompt.cpp ScreenPrompt.h ScreenRanking.cpp ScreenRanking.h \ -ScreenReloadSongs.cpp ScreenReloadSongs.h ScreenResetToDefaults.cpp ScreenResetToDefaults.h ScreenSandbox.cpp ScreenSandbox.h \ +ScreenReloadSongs.cpp ScreenReloadSongs.h ScreenSandbox.cpp ScreenSandbox.h \ ScreenSelect.cpp ScreenSelect.h ScreenSelectCharacter.cpp ScreenSelectCharacter.h \ ScreenSelectDifficulty.cpp ScreenSelectDifficulty.h ScreenSelectGroup.cpp ScreenSelectGroup.h \ ScreenSelectMaster.cpp ScreenSelectMaster.h ScreenSelectMode.cpp ScreenSelectMode.h \ diff --git a/stepmania/src/ScreenClearBookkeepingData.cpp b/stepmania/src/ScreenClearBookkeepingData.cpp deleted file mode 100644 index 87f5b088e0..0000000000 --- a/stepmania/src/ScreenClearBookkeepingData.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "global.h" -#include "ScreenClearBookkeepingData.h" -#include "ScreenManager.h" -#include "ThemeManager.h" -#include "Bookkeeper.h" - -#define NEXT_SCREEN THEME->GetMetric(m_sName,"NextScreen") - -REGISTER_SCREEN_CLASS( ScreenClearBookkeepingData ); -ScreenClearBookkeepingData::ScreenClearBookkeepingData( CString sName ): Screen( sName ) -{ - BOOKKEEPER->ClearAll(); - BOOKKEEPER->WriteToDisk(); - - SCREENMAN->SystemMessage( "Bookkeeping data cleared." ); - - SCREENMAN->SetNewScreen( NEXT_SCREEN ); -} - -/* - * (c) 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/ScreenClearBookkeepingData.h b/stepmania/src/ScreenClearBookkeepingData.h deleted file mode 100644 index 459d14eef5..0000000000 --- a/stepmania/src/ScreenClearBookkeepingData.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ScreenClearBookkeepingData_H -#define ScreenClearBookkeepingData_H - -#include "Screen.h" - -class ScreenClearBookkeepingData: public Screen -{ -public: - ScreenClearBookkeepingData( CString sName ); -}; - -#endif - -/* - * (c) 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/ScreenClearMachineStats.cpp b/stepmania/src/ScreenClearMachineStats.cpp deleted file mode 100644 index e2186a202a..0000000000 --- a/stepmania/src/ScreenClearMachineStats.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "global.h" -#include "ScreenClearMachineStats.h" -#include "ProfileManager.h" -#include "ScreenManager.h" -#include "ThemeManager.h" - -#define NEXT_SCREEN THEME->GetMetric(m_sName,"NextScreen") - -REGISTER_SCREEN_CLASS( ScreenClearMachineStats ); -ScreenClearMachineStats::ScreenClearMachineStats( CString sName ): Screen( sName ) -{ - Profile* pProfile = PROFILEMAN->GetMachineProfile(); - - // don't reset the Guid - CString sGuid = pProfile->m_sGuid; - - pProfile->InitAll(); - - pProfile->m_sGuid = sGuid; - - PROFILEMAN->SaveMachineProfile(); - - SCREENMAN->SystemMessage( "Machine stats cleared." ); - - SCREENMAN->SetNewScreen( NEXT_SCREEN ); -} - -/* - * (c) 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/ScreenClearMachineStats.h b/stepmania/src/ScreenClearMachineStats.h deleted file mode 100644 index d5500f0209..0000000000 --- a/stepmania/src/ScreenClearMachineStats.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ScreenClearMachineStats_H -#define ScreenClearMachineStats_H - -#include "Screen.h" - -class ScreenClearMachineStats: public Screen -{ -public: - ScreenClearMachineStats( CString sName ); -}; - -#endif - -/* - * (c) 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/ScreenDownloadMachineStats.cpp b/stepmania/src/ScreenDownloadMachineStats.cpp deleted file mode 100644 index cd09fe3503..0000000000 --- a/stepmania/src/ScreenDownloadMachineStats.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "global.h" -#include "ScreenDownloadMachineStats.h" -#include "ProfileManager.h" -#include "ScreenManager.h" -#include "MemoryCardManager.h" -#include "ThemeManager.h" -#include "PrefsManager.h" - -#define NEXT_SCREEN THEME->GetMetric(m_sName,"NextScreen") - -static void SaveMachineStatsToFirstMemCard() -{ - MEMCARDMAN->TryMountAllCards(); - - FOREACH_PlayerNumber( pn ) - { - if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY ) - continue; // skip - - CString sDir = MEM_CARD_MOUNT_POINT[pn]; - sDir += "MachineProfile/"; - - - bool bSaved = PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData ); - if( bSaved ) - SCREENMAN->SystemMessage( ssprintf("Machine stats saved to P%d card.",pn+1) ); - else - SCREENMAN->SystemMessage( ssprintf("Error saving stats to P%d card.",pn+1) ); - return; - } - - MEMCARDMAN->FlushAndReset(); - - SCREENMAN->SystemMessage( "Stats not saved - No memory cards ready." ); -} - -REGISTER_SCREEN_CLASS( ScreenDownloadMachineStats ); -ScreenDownloadMachineStats::ScreenDownloadMachineStats( CString sName ): Screen( sName ) -{ - SaveMachineStatsToFirstMemCard(); - - SCREENMAN->SetNewScreen( NEXT_SCREEN ); -} - -/* - * (c) 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/ScreenDownloadMachineStats.h b/stepmania/src/ScreenDownloadMachineStats.h deleted file mode 100644 index 3f5fa1a069..0000000000 --- a/stepmania/src/ScreenDownloadMachineStats.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef ScreenDownloadMachineStats_H -#define ScreenDownloadMachineStats_H - -#include "Screen.h" - -class ScreenDownloadMachineStats: public Screen -{ -public: - ScreenDownloadMachineStats( CString sName ); -}; - - -#endif - -/* - * (c) 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/ScreenInsertCredit.cpp b/stepmania/src/ScreenInsertCredit.cpp deleted file mode 100644 index 84a4c5f75b..0000000000 --- a/stepmania/src/ScreenInsertCredit.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "global.h" -#include "ScreenInsertCredit.h" -#include "ProfileManager.h" -#include "ScreenManager.h" -#include "MemoryCardManager.h" -#include "ThemeManager.h" -#include "PrefsManager.h" -#include "StepMania.h" - -#define NEXT_SCREEN THEME->GetMetric(m_sName,"NextScreen") - -static void SaveMachineStatsToFirstMemCard() -{ - InsertCredit(); -} - -REGISTER_SCREEN_CLASS( ScreenInsertCredit ); -ScreenInsertCredit::ScreenInsertCredit( CString sName ): Screen( sName ) -{ - SaveMachineStatsToFirstMemCard(); - - SCREENMAN->SetNewScreen( NEXT_SCREEN ); -} - -/* - * (c) 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/ScreenInsertCredit.h b/stepmania/src/ScreenInsertCredit.h deleted file mode 100644 index 5a28cfea78..0000000000 --- a/stepmania/src/ScreenInsertCredit.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef ScreenInsertCredit_H -#define ScreenInsertCredit_H - -#include "Screen.h" - -class ScreenInsertCredit: public Screen -{ -public: - ScreenInsertCredit( CString sName ); -}; - - -#endif - -/* - * (c) 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/ScreenResetToDefaults.cpp b/stepmania/src/ScreenResetToDefaults.cpp deleted file mode 100644 index a2a7f8366f..0000000000 --- a/stepmania/src/ScreenResetToDefaults.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "global.h" -#include "ScreenResetToDefaults.h" -#include "ProfileManager.h" -#include "ScreenManager.h" -#include "ThemeManager.h" -#include "PrefsManager.h" - -#define NEXT_SCREEN THEME->GetMetric(m_sName,"NextScreen") - -REGISTER_SCREEN_CLASS( ScreenResetToDefaults ); -ScreenResetToDefaults::ScreenResetToDefaults( CString sName ): Screen( sName ) -{ - PREFSMAN->ResetToFactoryDefaults(); - - SCREENMAN->SystemMessage( "All options reset to factory defaults." ); - - SCREENMAN->SetNewScreen( NEXT_SCREEN ); -} - -/* - * (c) 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/ScreenResetToDefaults.h b/stepmania/src/ScreenResetToDefaults.h deleted file mode 100644 index 528de980d9..0000000000 --- a/stepmania/src/ScreenResetToDefaults.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef ScreenResetToDefaults_H -#define ScreenResetToDefaults_H - -#include "Screen.h" -#include "RageTimer.h" - -class ScreenResetToDefaults: public Screen -{ -public: - ScreenResetToDefaults( CString sName ); -}; - -#endif - -/* - * (c) 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/StepMania.dsp b/stepmania/src/StepMania.dsp index c3b5153534..2bae530aa1 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -2386,22 +2386,6 @@ SOURCE=.\ScreenCenterImage.h # End Source File # Begin Source File -SOURCE=.\ScreenClearBookkeepingData.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScreenClearBookkeepingData.h -# End Source File -# Begin Source File - -SOURCE=.\ScreenClearMachineStats.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScreenClearMachineStats.h -# End Source File -# Begin Source File - SOURCE=.\ScreenCredits.cpp # End Source File # Begin Source File @@ -2418,14 +2402,6 @@ SOURCE=.\ScreenDemonstration.h # End Source File # Begin Source File -SOURCE=.\ScreenDownloadMachineStats.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScreenDownloadMachineStats.h -# End Source File -# Begin Source File - SOURCE=.\ScreenEdit.cpp # End Source File # Begin Source File @@ -2532,14 +2508,6 @@ SOURCE=.\ScreenHowToPlay.h # End Source File # Begin Source File -SOURCE=.\ScreenInsertCredit.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScreenInsertCredit.h -# End Source File -# Begin Source File - SOURCE=.\ScreenInstructions.cpp # End Source File # Begin Source File @@ -2728,14 +2696,6 @@ SOURCE=.\ScreenReloadSongs.h # End Source File # Begin Source File -SOURCE=.\ScreenResetToDefaults.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScreenResetToDefaults.h -# End Source File -# Begin Source File - SOURCE=.\ScreenSandbox.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index cb118fa720..57c00473e2 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -193,18 +193,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - - - - - - @@ -220,12 +208,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - - @@ -298,12 +280,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - - @@ -445,12 +421,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - -