From 5ff010ee4e1f12bfcb9eb9a318b03e65226f9d91 Mon Sep 17 00:00:00 2001
From: Nick <knightx@users.sourceforge.net>
Date: Thu, 4 Sep 2003 21:24:50 +0000
Subject: [PATCH] Added option to not save songs

---
 stepmania/src/ScreenEvaluation.cpp    |  2 +-
 stepmania/src/ScreenPlayerOptions.cpp |  6 ++-
 stepmania/src/SongOptions.cpp         |  1 +
 stepmania/src/SongOptions.h           |  2 +-
 stepmania/src/StepMania.dsp           | 62 +++++++++++++--------------
 5 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index d79f10d7f1..cbc90021e6 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -167,7 +167,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl
 		{
 			for( int p=0; p<NUM_PLAYERS; p++ )
 			{
-				if( GAMESTATE->IsHumanPlayer(p) )
+				if( GAMESTATE->IsHumanPlayer(p) && GAMESTATE->m_SongOptions.m_bSaveScore )
 				{
 					GAMESTATE->m_pCurNotes[p]->AddScore( (PlayerNumber)p, grade[p], stageStats.iScore[p] + stageStats.iBonus[p], bNewRecord[p] );
 					
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 5b40317478..08eb690f9d 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -49,6 +49,7 @@ enum {
 	SO_ASSIST,
 	SO_RATE,
 	SO_AUTOSYNC,
+	SO_SAVE,
 	NUM_PLAYER_OPTIONS_LINES
 };
 OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
@@ -71,7 +72,8 @@ OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
 	OptionRow( "Fail",			true, "ARCADE","END OF SONG","OFF" ),	
 	OptionRow( "Assist\nTick",	true, "OFF", "ON" ),
 	OptionRow( "Rate",			true, "0.3x","0.4x","0.5x","0.6x","0.7x","0.8x","0.9x","1.0x","1.1x","1.2x","1.3x","1.4x","1.5x","1.6x","1.7x","1.8x","1.9x","2.0x" ),	
-	OptionRow( "Auto\nAdjust",	true, "OFF", "ON" ),	
+	OptionRow( "Auto\nAdjust",	true, "OFF", "ON" ),
+	OptionRow( "Save\nScores",  true, "OFF", "ON" ),
 };
 
 static const PlayerOptions::Effect ChoosableEffects[] = 
@@ -302,6 +304,7 @@ void ScreenPlayerOptions::ImportOptions()
 	m_iSelectedOption[0][SO_FAIL] = so.m_FailType;
 	m_iSelectedOption[0][SO_ASSIST] = so.m_bAssistTick;
 	m_iSelectedOption[0][SO_AUTOSYNC] = so.m_bAutoSync;
+	m_iSelectedOption[0][SO_SAVE] = so.m_bSaveScore;
 
 	m_iSelectedOption[0][SO_RATE] = 7;	// in case we don't match below
 	for( i=0; i<g_PlayerOptionsLines[SO_RATE].choices.size(); i++ )
@@ -439,6 +442,7 @@ void ScreenPlayerOptions::ExportOptions()
 	}
 	so.m_bAssistTick = !!m_iSelectedOption[0][SO_ASSIST];
 	so.m_bAutoSync = !!m_iSelectedOption[0][SO_AUTOSYNC];
+	so.m_bSaveScore = !!m_iSelectedOption[0][SO_SAVE];
 
 	int iSel = m_iSelectedOption[0][SO_RATE];
 	so.m_fMusicRate = (float) atof( g_PlayerOptionsLines[SO_RATE].choices[iSel] );
diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp
index f925165cd1..77ffdceeb7 100644
--- a/stepmania/src/SongOptions.cpp
+++ b/stepmania/src/SongOptions.cpp
@@ -22,6 +22,7 @@ void SongOptions::Init()
 	m_bAssistTick = false;
 	m_fMusicRate = 1.0f;
 	m_bAutoSync = false;
+	m_bSaveScore = true;
 }
 
 CString SongOptions::GetString()
diff --git a/stepmania/src/SongOptions.h b/stepmania/src/SongOptions.h
index ff95c426b0..f69a98ff05 100644
--- a/stepmania/src/SongOptions.h
+++ b/stepmania/src/SongOptions.h
@@ -23,7 +23,7 @@ struct SongOptions
 	enum FailType { FAIL_ARCADE=0, FAIL_END_OF_SONG, FAIL_OFF };
 	FailType m_FailType;
 	float m_fMusicRate;
-	bool m_bAssistTick, m_bAutoSync;
+	bool m_bAssistTick, m_bAutoSync, m_bSaveScore;
 
 	SongOptions() { Init(); };
 	void Init();
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 983278a34b..b80b2adcf8 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -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
+TargetDir=\Program Files\stepmania
 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 ia32.vdi
 # End Special Build Tool
 
@@ -82,23 +82,23 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP
-# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP
-XBE=imagebld.exe
-# ADD BASE XBE /nologo /stack:0x10000 /debug
-# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe"
 XBCP=xbecopy.exe
 # ADD BASE XBCP /NOLOGO
 # ADD XBCP /NOLOGO
+XBE=imagebld.exe
+# ADD BASE XBE /nologo /stack:0x10000 /debug
+# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe"
+LINK32=link.exe
+# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP
+# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c
 # Begin Special Build Tool
-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 ia32.vdi
 # End Special Build Tool
 
@@ -135,10 +135,10 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /pdb:none
 # Begin Special Build Tool
 IntDir=.\../Release6
-TargetDir=\temp\stepmania
+TargetDir=\Program Files\stepmania
 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 ia32.vdi
 # End Special Build Tool
 
@@ -156,26 +156,26 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Intermediate_Dir "StepMania___Xbox_Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c
-# SUBTRACT CPP /Fr
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+XBCP=xbecopy.exe
+# ADD BASE XBCP /NOLOGO
+# ADD XBCP /NOLOGO
+XBE=imagebld.exe
+# ADD BASE XBE /nologo /stack:0x10000 /debug
+# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
 LINK32=link.exe
 # ADD BASE LINK32 $(intdir)\verstub.obj xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe"
 # SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # ADD LINK32 $(intdir)\verstub.obj xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xnet.lib xboxkrnl.lib libcmt.lib /nologo /incremental:no /pdb:"../release6xbox/StepMania.pdb" /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"../StepManiaXbox.exe" /subsystem:xbox /fixed:no /TMP /OPT:REF
 # SUBTRACT LINK32 /pdb:none /map /debug
-XBE=imagebld.exe
-# ADD BASE XBE /nologo /stack:0x10000 /debug
-# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
-XBCP=xbecopy.exe
-# ADD BASE XBCP /NOLOGO
-# ADD XBCP /NOLOGO
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c
+# SUBTRACT CPP /Fr
 # Begin Special Build Tool
-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 ia32.vdi
 # End Special Build Tool