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

show retry dialog if actor file has invalid reference

Browse Source
This commit is contained in:
Chris Danford
2004-08-07 21:32:43 +00:00
parent 089d1e109b
commit 2dab376f9b
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorUtil.cpp
+31 -2
View File
@@ -17,6 +17,8 @@
#include "SongManager.h" #include "SongManager.h"
#include "Course.h" #include "Course.h"
#include "arch/Dialog/Dialog.h"
Actor* LoadFromActorFile( CString sIniPath, CString sLayer ) Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
{ {
@@ -159,6 +161,7 @@ Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
} }
else else
{ {
retry:
/* XXX: We need to do a theme search, since the file we're loading might /* XXX: We need to do a theme search, since the file we're loading might
* be overridden by the theme. */ * be overridden by the theme. */
CString sNewPath = sDir+sFile; CString sNewPath = sDir+sFile;
@@ -171,9 +174,35 @@ Actor* LoadFromActorFile( CString sIniPath, CString sLayer )
GetDirListing( sNewPath + "*", asPaths, false, true ); // return path too GetDirListing( sNewPath + "*", asPaths, false, true ); // return path too
if( asPaths.empty() ) if( asPaths.empty() )
RageException::Throw( "The actor file '%s' references a file '%s' which doesn't exist.", sIniPath.c_str(), sFile.c_str() ); {
CString sError = ssprintf( "The actor file '%s' references a file '%s' which doesn't exist.", sIniPath.c_str(), sFile.c_str() );
switch( Dialog::RetryCancel( sError, sError ) )
{
case Dialog::cancel:
RageException::Throw( sError );
break;
case Dialog::retry:
FlushDirCache();
goto retry;
default:
ASSERT(0);
}
}
else if( asPaths.size() > 1 ) else if( asPaths.size() > 1 )
RageException::Throw( "The actor file '%s' references a file '%s' which has multiple matches.", sIniPath.c_str(), sFile.c_str() ); {
CString sError = ssprintf( "The actor file '%s' references a file '%s' which has multiple matches.", sIniPath.c_str(), sFile.c_str() );
switch( Dialog::RetryCancel( sError, sError ) )
{
case Dialog::cancel:
RageException::Throw( sError );
break;
case Dialog::retry:
FlushDirCache();
goto retry;
default:
ASSERT(0);
}
}
sNewPath = asPaths[0]; sNewPath = asPaths[0];
} }