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

Do not use datadir at Glenn's behest. Look for Packages as well as Songs so that this can be installed with the data in Packages.

Browse Source
This commit is contained in:
Steve Checkoway
2007-04-24 09:21:34 +00:00
parent 270f537b74
commit 04d4f0447e
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+6 -31
View File
@@ -267,40 +267,15 @@ void ArchHooks::MountInitialFilesystems( const RString &sDirOfExecutable )
FILEMAN->Mount( "dir", sUserDataPath + "/Save", "/Save" ); FILEMAN->Mount( "dir", sUserDataPath + "/Save", "/Save" );
FILEMAN->Mount( "dir", sUserDataPath + "/Screenshots", "/Screenshots" ); FILEMAN->Mount( "dir", sUserDataPath + "/Screenshots", "/Screenshots" );
/* Search for SMData.smzip in the directory of the executable RString Root;
* first in case some one has an older version installed in
* the datadir. Then search the datadir. Lastly look for
* Songs, using cwd last.
* XXX: Songs seems like a bad choice. The game will still run
* without Songs and they might have AdditionalSongFolders
* pointing to their songs. Themes seems like the one to look
* for since the game will not run without that. */
RString Root = "";
struct stat st; struct stat st;
if( !access(sDirOfExecutable + "/SMData.smzip", R_OK) ) if( !stat(sDirOfExecutable + "/Packages", &st) && st.st_mode&S_IFDIR )
{
FILEMAN->Mount( "dir", sDirOfExecutable, "/" );
FILEMAN->Mount( "zip", "/SMData.smzip", "/" );
return;
}
#ifdef DATADIR
#define XSTR(x) #x
#define STR(x) XSTR(x)
RString datadir = XSTR(DATADIR) "/" + sProductId;
if( !access(datadir + "/SMData.smzip", R_OK) )
{
FILEMAN->Mount( "dir", datadir, "/" );
FILEMAN->Mount( "zip", "/SMData.smzip", "/" );
return;
}
#undef STR
#undef XSTR
#endif
if( Root == "" && !stat( sDirOfExecutable + "/Songs", &st ) && st.st_mode&S_IFDIR )
Root = sDirOfExecutable; Root = sDirOfExecutable;
if( Root == "" && !stat( RageFileManagerUtil::sInitialWorkingDirectory + "/Songs", &st ) && st.st_mode&S_IFDIR ) else if( !stat(sDirOfExecutable + "/Songs", &st) && st.st_mode&S_IFDIR )
Root = sDirOfExecutable;
else if( !stat(RageFileManagerUtil::sInitialWorkingDirectory + "/Songs", &st) && st.st_mode&S_IFDIR )
Root = RageFileManagerUtil::sInitialWorkingDirectory; Root = RageFileManagerUtil::sInitialWorkingDirectory;
if( Root == "" ) else
RageException::Throw( COULDNT_FIND_SONGS.GetValue() ); RageException::Throw( COULDNT_FIND_SONGS.GetValue() );
FILEMAN->Mount( "dir", Root, "/" ); FILEMAN->Mount( "dir", Root, "/" );