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

Fix crash on extra stage.

Browse Source
This commit is contained in:
Steve Checkoway
2006-05-20 09:00:35 +00:00
parent 9da602cec4
commit 34a63dd8db
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SongManager.cpp
+7 -4
View File
@@ -35,6 +35,7 @@
#include "TitleSubstitution.h" #include "TitleSubstitution.h"
#include "LocalizedString.h" #include "LocalizedString.h"
#include "CatalogXml.h" #include "CatalogXml.h"
#include "NoteSkinManager.h"
SongManager* SONGMAN = NULL; // global and accessable from anywhere in our program SongManager* SONGMAN = NULL; // global and accessable from anywhere in our program
@@ -1076,8 +1077,8 @@ void SongManager::GetCoursesInGroup( vector<Course*> &AddTo, const RString &sCou
AddTo.push_back( m_pCourses[i] ); AddTo.push_back( m_pCourses[i] );
} }
bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, RString sPreferredGroup, bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, RString sPreferredGroup, Song*& pSongOut, Steps*& pStepsOut,
Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ) PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut )
{ {
const RString sCourseSuffix = sPreferredGroup + "/" + (bExtra2 ? "extra2" : "extra1") + ".crs"; const RString sCourseSuffix = sPreferredGroup + "/" + (bExtra2 ? "extra2" : "extra1") + ".crs";
RString sCoursePath = SONGS_DIR + sCourseSuffix; RString sCoursePath = SONGS_DIR + sCourseSuffix;
@@ -1097,6 +1098,7 @@ bool SongManager::GetExtraStageInfoFromCourse( bool bExtra2, RString sPreferredG
if( pPlayerOptionsOut != NULL ) if( pPlayerOptionsOut != NULL )
{ {
pPlayerOptionsOut->Init(); pPlayerOptionsOut->Init();
pPlayerOptionsOut->m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME;
pPlayerOptionsOut->FromString( pTrail->m_vEntries[0].Modifiers ); pPlayerOptionsOut->FromString( pTrail->m_vEntries[0].Modifiers );
} }
if( pSongOptionsOut != NULL ) if( pSongOptionsOut != NULL )
@@ -1128,8 +1130,8 @@ bool CompareNotesPointersForExtra(const Steps *n1, const Steps *n2)
return StepsUtil::CompareNotesPointersByRadarValues(n1,n2); return StepsUtil::CompareNotesPointersByRadarValues(n1,n2);
} }
void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, Song*& pSongOut, Steps*& pStepsOut,
Song*& pSongOut, Steps*& pStepsOut, PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut ) PlayerOptions *pPlayerOptionsOut, SongOptions *pSongOptionsOut )
{ {
RString sGroup = GAMESTATE->m_sPreferredSongGroup; RString sGroup = GAMESTATE->m_sPreferredSongGroup;
if( sGroup == GROUP_ALL ) if( sGroup == GROUP_ALL )
@@ -1204,6 +1206,7 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd,
if( pPlayerOptionsOut != NULL ) if( pPlayerOptionsOut != NULL )
{ {
pPlayerOptionsOut->Init(); pPlayerOptionsOut->Init();
pPlayerOptionsOut->m_sNoteSkin = NOTESKIN->GAME_BASE_NOTESKIN_NAME;
pPlayerOptionsOut->m_fScrolls[PlayerOptions::SCROLL_REVERSE] = 1; pPlayerOptionsOut->m_fScrolls[PlayerOptions::SCROLL_REVERSE] = 1;
pPlayerOptionsOut->m_fScrollSpeed = 1.5f; pPlayerOptionsOut->m_fScrollSpeed = 1.5f;
pPlayerOptionsOut->m_fDark = 1; pPlayerOptionsOut->m_fDark = 1;