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

Fixed hang when loading pump or solo notes

Browse Source
This commit is contained in:
Chris Danford
2002-10-21 02:15:06 +00:00
parent 6674d2a9a1
commit 3a6edc3d99
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenTitleMenu.cpp
+1 -1
View File
@@ -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 );
stepmania/src/Song.cpp
+6 -9
View File
@@ -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) )
// {
stepmania/stepmania.nsi
+4 -3
View File
@@ -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"