From 2fc1035d32c064edd4171778fc350a5c0d2edf88 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 16 May 2004 22:58:05 +0000 Subject: [PATCH] add ScreenClearBookkeepingData, ScreenResetToDefaults --- stepmania/src/Bookkeeper.cpp | 15 ++-- stepmania/src/Bookkeeper.h | 2 + stepmania/src/Makefile.am | 4 +- stepmania/src/PrefsManager.cpp | 32 +++++++-- stepmania/src/PrefsManager.h | 9 ++- stepmania/src/Screen.cpp | 4 ++ stepmania/src/ScreenClearBookkeepingData.cpp | 19 +++++ stepmania/src/ScreenClearBookkeepingData.h | 14 ++++ stepmania/src/ScreenClearMachineStats.cpp | 2 - stepmania/src/ScreenResetToDefaults.cpp | 19 +++++ stepmania/src/ScreenResetToDefaults.h | 14 ++++ stepmania/src/StepMania.dsp | 75 ++++++++++++++++++-- stepmania/src/StepMania.vcproj | 12 ++++ 13 files changed, 198 insertions(+), 23 deletions(-) create mode 100644 stepmania/src/ScreenClearBookkeepingData.cpp create mode 100644 stepmania/src/ScreenClearBookkeepingData.h create mode 100644 stepmania/src/ScreenResetToDefaults.cpp create mode 100644 stepmania/src/ScreenResetToDefaults.h diff --git a/stepmania/src/Bookkeeper.cpp b/stepmania/src/Bookkeeper.cpp index 7b1f00a316..1165013c40 100644 --- a/stepmania/src/Bookkeeper.cpp +++ b/stepmania/src/Bookkeeper.cpp @@ -30,12 +30,7 @@ const int COINS_DAT_VERSION = 1; Bookkeeper::Bookkeeper() { - int i, j; - - m_iLastSeenTime = time(NULL); - for( i=0; iWarn("Error parsing at %s:%d",__FILE__,__LINE__); return; } +void Bookkeeper::ClearAll() +{ + m_iLastSeenTime = time(NULL); + for( int i=0; iGetMetric(m_sName,"NextScreen") + +ScreenClearBookkeepingData::ScreenClearBookkeepingData( CString sName ): Screen( sName ) +{ + BOOKKEEPER->ClearAll(); + BOOKKEEPER->WriteToDisk(); + + SCREENMAN->SystemMessage( "Bookkeeping data cleared." ); + + SCREENMAN->SetNewScreen( NEXT_SCREEN ); +} + diff --git a/stepmania/src/ScreenClearBookkeepingData.h b/stepmania/src/ScreenClearBookkeepingData.h new file mode 100644 index 0000000000..107d4896e4 --- /dev/null +++ b/stepmania/src/ScreenClearBookkeepingData.h @@ -0,0 +1,14 @@ +#ifndef ScreenClearBookkeepingData_H +#define ScreenClearBookkeepingData_H + +#include "Screen.h" +#include "RageTimer.h" + +class ScreenClearBookkeepingData: public Screen +{ +public: + ScreenClearBookkeepingData( CString sName ); +}; + + +#endif diff --git a/stepmania/src/ScreenClearMachineStats.cpp b/stepmania/src/ScreenClearMachineStats.cpp index a247086093..96ee08f835 100644 --- a/stepmania/src/ScreenClearMachineStats.cpp +++ b/stepmania/src/ScreenClearMachineStats.cpp @@ -3,9 +3,7 @@ #include "ScreenClearMachineStats.h" #include "ProfileManager.h" #include "ScreenManager.h" -#include "MemoryCardManager.h" #include "ThemeManager.h" -#include "PrefsManager.h" #define NEXT_SCREEN THEME->GetMetric(m_sName,"NextScreen") diff --git a/stepmania/src/ScreenResetToDefaults.cpp b/stepmania/src/ScreenResetToDefaults.cpp new file mode 100644 index 0000000000..393b183d73 --- /dev/null +++ b/stepmania/src/ScreenResetToDefaults.cpp @@ -0,0 +1,19 @@ +#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") + +ScreenResetToDefaults::ScreenResetToDefaults( CString sName ): Screen( sName ) +{ + PREFSMAN->ResetToFactoryDefaults(); + + SCREENMAN->SystemMessage( "All options reset to factory defaults." ); + + SCREENMAN->SetNewScreen( NEXT_SCREEN ); +} + diff --git a/stepmania/src/ScreenResetToDefaults.h b/stepmania/src/ScreenResetToDefaults.h new file mode 100644 index 0000000000..3e6736ffd9 --- /dev/null +++ b/stepmania/src/ScreenResetToDefaults.h @@ -0,0 +1,14 @@ +#ifndef ScreenResetToDefaults_H +#define ScreenResetToDefaults_H + +#include "Screen.h" +#include "RageTimer.h" + +class ScreenResetToDefaults: public Screen +{ +public: + ScreenResetToDefaults( CString sName ); +}; + + +#endif diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index a44d86a06e..a8b8bfa9d1 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# Microsoft Developer Studio Generated Build File, Format Version 60000 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 @@ -62,10 +62,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\temp\stepmania\Program +TargetDir=\stepmania\stepmania\Program TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -99,6 +99,10 @@ XBCP=xbecopy.exe # ADD BASE XBCP /NOLOGO # ADD XBCP /NOLOGO # Begin Special Build Tool +IntDir=.\../Debug_Xbox +TargetDir=\stepmania\stepmania +TargetName=default +SOURCE="$(InputPath)" PreLink_Cmds=disasm\verinc cl /Zl /nologo /c PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -135,10 +139,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none /debug # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\temp\stepmania\Program +TargetDir=\stepmania\stepmania\Program TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -174,6 +178,10 @@ XBCP=xbecopy.exe # ADD BASE XBCP /NOLOGO # ADD XBCP /NOLOGO # Begin Special Build Tool +IntDir=.\../Release_Xbox +TargetDir=\stepmania\stepmania +TargetName=default +SOURCE="$(InputPath)" PreLink_Cmds=disasm\verinc cl /Zl /nologo /c PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi # End Special Build Tool @@ -4964,6 +4972,44 @@ SOURCE=.\ScreenCenterImage.h # End Source File # Begin Source File +SOURCE=.\ScreenClearBookkeepingData.cpp + +!IF "$(CFG)" == "StepMania - Win32 Debug" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" + +!ELSEIF "$(CFG)" == "StepMania - Win32 Release" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ScreenClearBookkeepingData.h +# End Source File +# Begin Source File + +SOURCE=.\ScreenClearMachineStats.cpp + +!IF "$(CFG)" == "StepMania - Win32 Debug" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" + +!ELSEIF "$(CFG)" == "StepMania - Win32 Release" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ScreenClearMachineStats.h +# End Source File +# Begin Source File + SOURCE=.\ScreenCredits.cpp !IF "$(CFG)" == "StepMania - Win32 Debug" @@ -5579,6 +5625,25 @@ SOURCE=.\ScreenReloadSongs.h # End Source File # Begin Source File +SOURCE=.\ScreenResetToDefaults.cpp + +!IF "$(CFG)" == "StepMania - Win32 Debug" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" + +!ELSEIF "$(CFG)" == "StepMania - Win32 Release" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ScreenResetToDefaults.h +# End Source File +# Begin Source File + SOURCE=.\ScreenSandbox.cpp !IF "$(CFG)" == "StepMania - Win32 Debug" diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 27cd9a8a30..1282209cb2 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -205,6 +205,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + + @@ -406,6 +412,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + +