smpackage: fix courses and RandomMovies being added to zip file twice
This commit is contained in:
@@ -93,8 +93,8 @@ PrefsManager::PrefsManager()
|
|||||||
* stage CRS files) don't get it changed around on them. */
|
* stage CRS files) don't get it changed around on them. */
|
||||||
m_bPickExtraStage = false;
|
m_bPickExtraStage = false;
|
||||||
|
|
||||||
m_fLongVerSongSeconds = 60*3;
|
m_fLongVerSongSeconds = 60*2.5f; // Dynamite Rave is 2:55
|
||||||
m_fMarathonVerSongSeconds = 60*5;
|
m_fMarathonVerSongSeconds = 60*5.f;
|
||||||
|
|
||||||
/* I'd rather get occasional people asking for support for this even though it's
|
/* I'd rather get occasional people asking for support for this even though it's
|
||||||
* already here than lots of people asking why songs aren't being displayed. */
|
* already here than lots of people asking why songs aren't being displayed. */
|
||||||
|
|||||||
@@ -91,9 +91,17 @@ void GetFilePaths( CString sDirOrFile, CStringArray& asPathToFilesOut )
|
|||||||
// Not sure if this is ZipArchive's fault.
|
// Not sure if this is ZipArchive's fault.
|
||||||
|
|
||||||
if( IsADirectory(sDirOrFile) && sDirOrFile.Right(1) != "\\" )
|
if( IsADirectory(sDirOrFile) && sDirOrFile.Right(1) != "\\" )
|
||||||
|
{
|
||||||
sDirOrFile += "\\";
|
sDirOrFile += "\\";
|
||||||
|
sDirOrFile += "*.*";
|
||||||
|
}
|
||||||
|
|
||||||
|
if( IsAFile(sDirOrFile) )
|
||||||
|
{
|
||||||
|
asPathToFilesOut.Add( sDirOrFile );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
sDirOrFile += "*.*";
|
|
||||||
|
|
||||||
GetDirListing( sDirOrFile, asPathToFilesOut, false, true );
|
GetDirListing( sDirOrFile, asPathToFilesOut, false, true );
|
||||||
GetDirListing( sDirOrFile, asDirectoriesToExplore, true, true );
|
GetDirListing( sDirOrFile, asDirectoriesToExplore, true, true );
|
||||||
@@ -157,7 +165,6 @@ bool ExportPackage( CString sPackageName, const CStringArray& asDirectoriesToExp
|
|||||||
for( int i=0; i<asDirectoriesToExport.GetSize(); i++ )
|
for( int i=0; i<asDirectoriesToExport.GetSize(); i++ )
|
||||||
{
|
{
|
||||||
CStringArray asFilePaths;
|
CStringArray asFilePaths;
|
||||||
asFilePaths.Add( asDirectoriesToExport[i] );
|
|
||||||
GetFilePaths( asDirectoriesToExport[i], asFilePaths );
|
GetFilePaths( asDirectoriesToExport[i], asFilePaths );
|
||||||
|
|
||||||
for( int j=0; j<asFilePaths.GetSize(); j++ )
|
for( int j=0; j<asFilePaths.GetSize(); j++ )
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ Class2=CSmpackageDlg
|
|||||||
|
|
||||||
ResourceCount=5
|
ResourceCount=5
|
||||||
Resource1=IDR_MAINFRAME
|
Resource1=IDR_MAINFRAME
|
||||||
Resource2=IDD_DIALOG_NAME
|
Resource2=IDD_INSTALL
|
||||||
Class3=CSMPackageInstallDlg
|
Class3=CSMPackageInstallDlg
|
||||||
Class4=CSmpackageExportDlg
|
Class4=CSmpackageExportDlg
|
||||||
Resource3=IDD_INSTALL
|
Resource3=IDD_DIALOG_NAME
|
||||||
Class5=EnterName
|
Class5=EnterName
|
||||||
Resource4=IDD_EXPORTER
|
Resource4=IDD_EXPORTER
|
||||||
Class6=EditInsallations
|
Class6=EditInsallations
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
!define PRODUCT_NAME_VER "${PRODUCT_NAME} ${VERSION}"
|
!define PRODUCT_NAME_VER "${PRODUCT_NAME} ${VERSION}"
|
||||||
|
|
||||||
Name "${PRODUCT_NAME}"
|
Name "${PRODUCT_NAME}"
|
||||||
OutFile "StepMania-CVS-20030224.exe"
|
OutFile "StepMania-CVS-20030226.exe"
|
||||||
;OutFile "StepMania301.exe"
|
;OutFile "StepMania301.exe"
|
||||||
|
|
||||||
; Some default compiler settings (uncomment and change at will):
|
; Some default compiler settings (uncomment and change at will):
|
||||||
|
|||||||
Reference in New Issue
Block a user