Changeset View
Changeset View
Standalone View
Standalone View
source/ps/GameSetup/GameSetup.cpp
| Show First 20 Lines • Show All 366 Lines • ▼ Show 20 Lines | if (!reentering) | ||||
| reentering = false; | reentering = false; | ||||
| } | } | ||||
| } | } | ||||
| // We don't actually implement the error display here, so return appropriately | // We don't actually implement the error display here, so return appropriately | ||||
| return ERI_NOT_IMPLEMENTED; | return ERI_NOT_IMPLEMENTED; | ||||
| } | } | ||||
| const std::vector<CStr>& GetMods(const CmdLineArgs& args, int flags) | |||||
| { | |||||
| const bool init_mods = (flags & INIT_MODS) == INIT_MODS; | |||||
| const bool add_user = !InDevelopmentCopy() && !args.Has("noUserMod"); | |||||
| const bool add_public = (flags & INIT_MODS_PUBLIC) == INIT_MODS_PUBLIC; | |||||
| if (!init_mods) | |||||
| { | |||||
| // Add the user mod if it should be present | |||||
| if (add_user && (g_modsLoaded.empty() || g_modsLoaded.back() != "user")) | |||||
| g_modsLoaded.push_back("user"); | |||||
| return g_modsLoaded; | |||||
| } | |||||
| g_modsLoaded = args.GetMultiple("mod"); | |||||
| if (add_public) | |||||
| g_modsLoaded.insert(g_modsLoaded.begin(), "public"); | |||||
| g_modsLoaded.insert(g_modsLoaded.begin(), "mod"); | |||||
| // Add the user mod if not explicitly disabled or we have a dev copy so | |||||
| // that saved files end up in version control and not in the user mod. | |||||
| if (add_user) | |||||
| g_modsLoaded.push_back("user"); | |||||
| return g_modsLoaded; | |||||
| } | |||||
| void MountMods(const Paths& paths, const std::vector<CStr>& mods) | void MountMods(const Paths& paths, const std::vector<CStr>& mods) | ||||
| { | { | ||||
| OsPath modPath = paths.RData()/"mods"; | OsPath modPath = paths.RData()/"mods"; | ||||
| OsPath modUserPath = paths.UserData()/"mods"; | OsPath modUserPath = paths.UserData()/"mods"; | ||||
| for (size_t i = 0; i < mods.size(); ++i) | for (size_t i = 0; i < mods.size(); ++i) | ||||
| { | { | ||||
| size_t priority = (i+1)*2; // mods are higher priority than regular mountings, which default to priority 0 | size_t priority = (i+1)*2; // mods are higher priority than regular mountings, which default to priority 0 | ||||
| size_t userFlags = VFS_MOUNT_WATCH|VFS_MOUNT_ARCHIVABLE|VFS_MOUNT_REPLACEABLE; | size_t userFlags = VFS_MOUNT_WATCH|VFS_MOUNT_ARCHIVABLE|VFS_MOUNT_REPLACEABLE; | ||||
| ▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines | static void InitVfs(const CmdLineArgs& args, int flags) | ||||
| g_VFS = CreateVfs(); | g_VFS = CreateVfs(); | ||||
| const OsPath readonlyConfig = paths.RData()/"config"/""; | const OsPath readonlyConfig = paths.RData()/"config"/""; | ||||
| g_VFS->Mount(L"config/", readonlyConfig); | g_VFS->Mount(L"config/", readonlyConfig); | ||||
| // Engine localization files. | // Engine localization files. | ||||
| g_VFS->Mount(L"l10n/", paths.RData()/"l10n"/""); | g_VFS->Mount(L"l10n/", paths.RData()/"l10n"/""); | ||||
| MountMods(paths, GetMods(args, flags)); | MountMods(paths, Mod::GetModsFromArguments(args, flags)); | ||||
Silier: same? | |||||
| // We mount these dirs last as otherwise writing could result in files being placed in a mod's dir. | // We mount these dirs last as otherwise writing could result in files being placed in a mod's dir. | ||||
| g_VFS->Mount(L"screenshots/", paths.UserData()/"screenshots"/""); | g_VFS->Mount(L"screenshots/", paths.UserData()/"screenshots"/""); | ||||
| g_VFS->Mount(L"saves/", paths.UserData()/"saves"/"", VFS_MOUNT_WATCH); | g_VFS->Mount(L"saves/", paths.UserData()/"saves"/"", VFS_MOUNT_WATCH); | ||||
| // Mounting with highest priority, so that a mod supplied user.cfg is harmless | // Mounting with highest priority, so that a mod supplied user.cfg is harmless | ||||
| g_VFS->Mount(L"config/", readonlyConfig, 0, (size_t)-1); | g_VFS->Mount(L"config/", readonlyConfig, 0, (size_t)-1); | ||||
| if(readonlyConfig != paths.Config()) | if(readonlyConfig != paths.Config()) | ||||
| g_VFS->Mount(L"config/", paths.Config(), 0, (size_t)-1); | g_VFS->Mount(L"config/", paths.Config(), 0, (size_t)-1); | ||||
| ▲ Show 20 Lines • Show All 394 Lines • ▼ Show 20 Lines | |||||
| bool Autostart(const CmdLineArgs& args); | bool Autostart(const CmdLineArgs& args); | ||||
| /** | /** | ||||
| * Returns true if the user has intended to start a visual replay from command line. | * Returns true if the user has intended to start a visual replay from command line. | ||||
| */ | */ | ||||
| bool AutostartVisualReplay(const std::string& replayFile); | bool AutostartVisualReplay(const std::string& replayFile); | ||||
| bool Init(const CmdLineArgs& args, int flags) | bool EnableModsOrSetDefault(const CmdLineArgs& args, int flags, const std::vector<CStr>& mods, bool fromConfig) | ||||
| { | |||||
| if (Mod::CheckAndEnableMods(g_ScriptContext, mods)) | |||||
| return true; | |||||
Not Done Inline Actionsearly return. Stan: early return. | |||||
| // Here we refuse to start as there is no gui anyway | |||||
| if (args.Has("autostart-nonvisual")) | |||||
| { | |||||
| if (fromConfig) | |||||
| LOGERROR("Mods defined in config file are not compatible."); | |||||
Not Done Inline ActionsDoes this work or do you have to use debug_printf? (or both) Stan: Does this work or do you have to use debug_printf? (or both) | |||||
Done Inline Actionsit is same as in main. though it does not display on command line Silier: it is same as in main. though it does not display on command line | |||||
| else | |||||
| LOGERROR("Trying to start with incompatible mods."); | |||||
| return false; | |||||
| } | |||||
| // When mods are incompatible, we enforce default ones so user is able | |||||
| // to start the game without wall of error strings | |||||
Done Inline Actionsremove this comment Silier: remove this comment | |||||
| if (!fromConfig) | |||||
| LOGERROR("Trying to start with incompatible mods. Setting default mods."); | |||||
| Mod::SetDefaultMods(g_ScriptContext, args, flags); | |||||
| RestartEngine(); | |||||
| return false; | |||||
| } | |||||
| bool Init(const CmdLineArgs& args, int& flags) | |||||
| { | { | ||||
| h_mgr_init(); | h_mgr_init(); | ||||
| // Do this as soon as possible, because it chdirs | // Do this as soon as possible, because it chdirs | ||||
| // and will mess up the error reporting if anything | // and will mess up the error reporting if anything | ||||
| // crashes before the working directory is set. | // crashes before the working directory is set. | ||||
| InitVfs(args, flags); | InitVfs(args, flags); | ||||
| ▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines | if (!args.Has("autostart-nonvisual") && !g_DisableAudio) | ||||
| ISoundManager::CreateSoundManager(); | ISoundManager::CreateSoundManager(); | ||||
| #endif | #endif | ||||
| // Check if there are mods specified on the command line, | // Check if there are mods specified on the command line, | ||||
| // or if we already set the mods (~INIT_MODS), | // or if we already set the mods (~INIT_MODS), | ||||
| // else check if there are mods that should be loaded specified | // else check if there are mods that should be loaded specified | ||||
| // in the config and load those (by aborting init and restarting | // in the config and load those (by aborting init and restarting | ||||
| // the engine). | // the engine). | ||||
| if (!args.Has("mod") && (flags & INIT_MODS) == INIT_MODS) | |||||
| if (!args.Has("mod")) | |||||
| { | |||||
| if ((flags & INIT_MODS) == INIT_MODS) | |||||
| { | { | ||||
| CStr modstring; | CStr modstring; | ||||
| CFG_GET_VAL("mod.enabledmods", modstring); | CFG_GET_VAL("mod.enabledmods", modstring); | ||||
| if (!modstring.empty()) | if (!modstring.empty()) | ||||
| { | { | ||||
| std::vector<CStr> mods; | std::vector<CStr> mods; | ||||
| boost::split(mods, modstring, boost::is_any_of(" "), boost::token_compress_on); | boost::split(mods, modstring, boost::is_any_of(" "), boost::token_compress_on); | ||||
| std::swap(g_modsLoaded, mods); | if (!EnableModsOrSetDefault(args, flags, mods, true)) | ||||
| { | |||||
| flags |= INIT_MODS_INFORM_INCOMPATIBLE; | |||||
Done Inline Actionsugh, should be |= Silier: ugh, should be |= | |||||
| return false; | |||||
| } | |||||
| // Abort init and restart | |||||
| RestartEngine(); | RestartEngine(); | ||||
| return false; | return false; | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| else if (!EnableModsOrSetDefault(args, flags, g_modsLoaded, false)) | |||||
| return false; | |||||
Not Done Inline ActionsCould invert or at least merge the below if; Stan: Could invert or at least merge the below if; | |||||
| new L10n; | new L10n; | ||||
| // Optionally start profiler HTTP output automatically | // Optionally start profiler HTTP output automatically | ||||
| // (By default it's only enabled by a hotkey, for security/performance) | // (By default it's only enabled by a hotkey, for security/performance) | ||||
| bool profilerHTTPEnable = false; | bool profilerHTTPEnable = false; | ||||
| CFG_GET_VAL("profiler2.autoenable", profilerHTTPEnable); | CFG_GET_VAL("profiler2.autoenable", profilerHTTPEnable); | ||||
| if (profilerHTTPEnable) | if (profilerHTTPEnable) | ||||
| g_Profiler2.EnableHTTP(); | g_Profiler2.EnableHTTP(); | ||||
| ▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 Lines | if (!AutostartVisualReplay(args.Get("replay-visual")) && !Autostart(args)) | ||||
| shared_ptr<ScriptInterface> scriptInterface = g_GUI->GetScriptInterface(); | shared_ptr<ScriptInterface> scriptInterface = g_GUI->GetScriptInterface(); | ||||
| ScriptRequest rq(scriptInterface); | ScriptRequest rq(scriptInterface); | ||||
| JS::RootedValue data(rq.cx); | JS::RootedValue data(rq.cx); | ||||
| if (g_GUI) | if (g_GUI) | ||||
| { | { | ||||
| ScriptInterface::CreateObject(rq, &data, "isStartup", true); | ScriptInterface::CreateObject(rq, &data, "isStartup", true); | ||||
| if (!installedMods.empty()) | if (!installedMods.empty()) | ||||
| scriptInterface->SetProperty(data, "installedMods", installedMods); | scriptInterface->SetProperty(data, "installedMods", installedMods); | ||||
| if ((flags & INIT_MODS_INFORM_INCOMPATIBLE) == INIT_MODS_INFORM_INCOMPATIBLE) | |||||
| scriptInterface->SetProperty(data, "incompatibleMods", true); | |||||
| } | } | ||||
| InitPs(setup_gui, installedMods.empty() ? L"page_pregame.xml" : L"page_modmod.xml", g_GUI->GetScriptInterface().get(), data); | InitPs(setup_gui, installedMods.empty() ? L"page_pregame.xml" : L"page_modmod.xml", g_GUI->GetScriptInterface().get(), data); | ||||
| } | } | ||||
| } | } | ||||
| catch (PSERROR_Game_World_MapLoadFailed& e) | catch (PSERROR_Game_World_MapLoadFailed& e) | ||||
| { | { | ||||
| // Map Loading failed | // Map Loading failed | ||||
| ▲ Show 20 Lines • Show All 565 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator
same?