From 3a6edc3d99794f6d938b53814403f8b63b200613 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 21 Oct 2002 02:15:06 +0000
Subject: [PATCH] Fixed hang when loading pump or solo notes

---
 stepmania/src/ScreenTitleMenu.cpp |  2 +-
 stepmania/src/Song.cpp            | 15 ++++++---------
 stepmania/stepmania.nsi           |  7 ++++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 8d39eb0d57..3d5fa84231 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -116,7 +116,7 @@ ScreenTitleMenu::ScreenTitleMenu()
 
 	
 	m_textVersion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
-	m_textVersion.SetText( "v3.0 beta 6" );
+	m_textVersion.SetText( "v3.0 beta 6 rc3" );
 	m_textVersion.SetDiffuse( D3DXCOLOR(0.6f,0.6f,0.6f,1) );	// light gray
 	m_textVersion.SetXY( VERSION_X, VERSION_Y );
 	m_textVersion.SetZoom( 0.5f );
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 27b0aacfbb..a418fe555d 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -33,7 +33,7 @@
 #include "NotesLoaderKSF.h"
 #include "NotesWriterDWI.h"
 
-const int FILE_CACHE_VERSION = 99;	// increment this when Song or Notes changes to invalidate cache
+const int FILE_CACHE_VERSION = 100;	// increment this when Song or Notes changes to invalidate cache
 
 
 int CompareBPMSegments(const void *arg1, const void *arg2)
@@ -779,14 +779,11 @@ void Song::AddAutoGenNotes()
 {
 	// This is way too slow.  Only autogen dance->pump and pump->dance
 	CArray<NotesType,NotesType> aMissingNotesTypes;
-	if( !SongHasNotesType(NOTES_TYPE_DANCE_SINGLE) )
-		aMissingNotesTypes.Add( NOTES_TYPE_DANCE_SINGLE );
-	if( !SongHasNotesType(NOTES_TYPE_DANCE_DOUBLE) )
-		aMissingNotesTypes.Add( NOTES_TYPE_DANCE_SOLO );
-	if( !SongHasNotesType(NOTES_TYPE_DANCE_SOLO) )
-		aMissingNotesTypes.Add( NOTES_TYPE_PUMP_SINGLE );
-	if( !SongHasNotesType(NOTES_TYPE_DANCE_SINGLE) )
-		aMissingNotesTypes.Add( NOTES_TYPE_PUMP_DOUBLE );
+	if( !SongHasNotesType(NOTES_TYPE_DANCE_SINGLE) )	aMissingNotesTypes.Add( NOTES_TYPE_DANCE_SINGLE );
+	if( !SongHasNotesType(NOTES_TYPE_DANCE_DOUBLE) )	aMissingNotesTypes.Add( NOTES_TYPE_DANCE_DOUBLE );
+	if( !SongHasNotesType(NOTES_TYPE_DANCE_SOLO) )		aMissingNotesTypes.Add( NOTES_TYPE_DANCE_SOLO );
+	if( !SongHasNotesType(NOTES_TYPE_PUMP_SINGLE) )		aMissingNotesTypes.Add( NOTES_TYPE_PUMP_SINGLE );
+	if( !SongHasNotesType(NOTES_TYPE_PUMP_DOUBLE) )		aMissingNotesTypes.Add( NOTES_TYPE_PUMP_DOUBLE );
 
 //	for( NotesType ntMissing=(NotesType)0; ntMissing<NUM_NOTES_TYPES; ntMissing=(NotesType)(ntMissing+1) )
 //	{
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index 0b792b28c7..28a8520be5 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -1,15 +1,14 @@
 ; NSIS Install Script
 ; created by 
 ;     BBF 
-;     chrisdanford
 ; I use the following command to create the installer:
 ; D:\Program Files\NSIS>makensis.exe /v3 /cd "m:\Dev Projects\CVS\stepmania\stepmania.nsi"
 ;
 ; NOTE: this .NSI script is designed for NSIS v1.8+
 
 Name "StepMania"
-OutFile "stepmania300beta6rc2.exe"
-!define PRODUCT_NAME "StepMania 3.0 beta 6 release candidate 2"
+OutFile "stepmania300beta6rc3.exe"
+!define PRODUCT_NAME "StepMania 3.0 beta 6 rc3"
 
 
 ; Some default compiler settings (uncomment and change at will):
@@ -117,6 +116,7 @@ CreateDirectory "$INSTDIR\Music"
 SetOutPath "$INSTDIR\Music"
 File "Music\instructions.txt"
 
+RMDir /r "$INSTDIR\NoteSkins\dance\MAX"
 CreateDirectory "$INSTDIR\NoteSkins\dance\MAX"
 SetOutPath "$INSTDIR\NoteSkins"
 File "NoteSkins\instructions.txt"
@@ -131,6 +131,7 @@ CreateDirectory "$INSTDIR\Songs"
 SetOutPath "$INSTDIR\Songs"
 File "Songs\instructions.txt"
 
+RMDir /r "$INSTDIR\Themes\default"
 CreateDirectory "$INSTDIR\Themes"
 SetOutPath "$INSTDIR\Themes"
 File "Themes\instructions.txt"