From af6c1f3911fe4eacf2df98e9aae5c0fac155f5fd Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 11 Apr 2009 19:23:41 +0000 Subject: [PATCH] fix system packages not working. MountInitialFilesystems should mount USER_PACKAGES_DIR, and let PACKAGES_DIR be supplied by the program directory mount --- stepmania/src/SpecialFiles.cpp | 2 +- stepmania/src/SpecialFiles.h | 2 +- stepmania/src/StepMania.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/SpecialFiles.cpp b/stepmania/src/SpecialFiles.cpp index 0facacb5bc..e4b35d7f40 100644 --- a/stepmania/src/SpecialFiles.cpp +++ b/stepmania/src/SpecialFiles.cpp @@ -2,7 +2,7 @@ #include "SpecialFiles.h" const RString SpecialFiles::USER_PACKAGES_DIR = "UserPackages/"; -const RString SpecialFiles::SYSTEM_PACKAGES_DIR = "SystemPackages/"; +const RString SpecialFiles::PACKAGES_DIR = "Packages/"; const RString SpecialFiles::KEYMAPS_PATH = "Save/Keymaps.ini"; const RString SpecialFiles::PREFERENCES_INI_PATH = "Save/Preferences.ini"; const RString SpecialFiles::THEMES_DIR = "Themes/"; diff --git a/stepmania/src/SpecialFiles.h b/stepmania/src/SpecialFiles.h index 2af39766a7..b83ce7a94e 100644 --- a/stepmania/src/SpecialFiles.h +++ b/stepmania/src/SpecialFiles.h @@ -6,7 +6,7 @@ namespace SpecialFiles { extern const RString USER_PACKAGES_DIR; - extern const RString SYSTEM_PACKAGES_DIR; + extern const RString PACKAGES_DIR; // system packages (not user packages) extern const RString KEYMAPS_PATH; extern const RString PREFERENCES_INI_PATH; extern const RString THEMES_DIR; diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 82624195d6..e152f6e350 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1001,7 +1001,8 @@ int main(int argc, char* argv[]) FILEMAN->Mount( "dir", dirs[i], "/AdditionalCourses" ); } - MountTreeOfZips( SpecialFiles::SYSTEM_PACKAGES_DIR ); + MountTreeOfZips( SpecialFiles::PACKAGES_DIR ); + MountTreeOfZips( SpecialFiles::USER_PACKAGES_DIR ); /* One of the above filesystems might contain files that affect preferences, eg Data/Static.ini. * Re-read preferences. */