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

Create an "Other" category for ScreenHowToPlay steps.sm, and other

Browse Source 
files that don't really go anywhere else.

Fix possible ELEMENT_CATEGORY_STRING null pointer dereference.
This commit is contained in:
Glenn Maynard
2003-09-11 23:21:33 +00:00
parent 6b84056a1c
commit f948027667
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenHowToPlay.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay")
} }
SMLoader smfile; SMLoader smfile;
smfile.LoadFromSMFile( THEME->GetPathToSM(STEPFILE), m_Song, false ); smfile.LoadFromSMFile( THEME->GetPathToO(STEPFILE), m_Song, false );
ASSERT( m_Song.m_apNotes.size() == 1 ); ASSERT( m_Song.m_apNotes.size() == 1 );
m_Song.m_apNotes[0]->GetNoteData(&m_NoteData); m_Song.m_apNotes[0]->GetNoteData(&m_NoteData);
stepmania/src/ThemeManager.cpp
+2 -1
View File
@@ -41,7 +41,8 @@ const CString ELEMENT_CATEGORY_STRING[NUM_ELEMENT_CATEGORIES] =
"Fonts", "Fonts",
"Graphics", "Graphics",
"Numbers", "Numbers",
"Sounds" "Sounds",
"Other"
}; };
ThemeManager::ThemeManager() ThemeManager::ThemeManager()
stepmania/src/ThemeManager.h
+2 -2
View File
@@ -17,7 +17,7 @@
class IniFile; class IniFile;
enum ElementCategory { BGAnimations, Fonts, Graphics, Numbers, Sounds, SMFiles, NUM_ELEMENT_CATEGORIES }; enum ElementCategory { BGAnimations, Fonts, Graphics, Numbers, Sounds, Other, NUM_ELEMENT_CATEGORIES };
class ThemeManager class ThemeManager
{ {
@@ -41,7 +41,7 @@ public:
CString GetPathToG( CString sFileName, bool bOptional=false ) { return GetPathTo(Graphics,sFileName,bOptional); }; CString GetPathToG( CString sFileName, bool bOptional=false ) { return GetPathTo(Graphics,sFileName,bOptional); };
CString GetPathToN( CString sFileName, bool bOptional=false ) { return GetPathTo(Numbers,sFileName,bOptional); }; CString GetPathToN( CString sFileName, bool bOptional=false ) { return GetPathTo(Numbers,sFileName,bOptional); };
CString GetPathToS( CString sFileName, bool bOptional=false ) { return GetPathTo(Sounds,sFileName,bOptional); }; CString GetPathToS( CString sFileName, bool bOptional=false ) { return GetPathTo(Sounds,sFileName,bOptional); };
CString GetPathToSM( CString sFileName, bool bOptional=false ) { return GetPathTo(SMFiles,sFileName,bOptional); }; CString GetPathToO( CString sFileName, bool bOptional=false ) { return GetPathTo(Other,sFileName,bOptional); };
bool HasMetric( CString sClassName, CString sValueName ); bool HasMetric( CString sClassName, CString sValueName );
CString GetMetricRaw( CString sClassName, CString sValueName ); CString GetMetricRaw( CString sClassName, CString sValueName );