Changeset View
Changeset View
Standalone View
Standalone View
source/main.cpp
Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines | |||||
#include "ps/CConsole.h" | #include "ps/CConsole.h" | ||||
#include "ps/CLogger.h" | #include "ps/CLogger.h" | ||||
#include "ps/ConfigDB.h" | #include "ps/ConfigDB.h" | ||||
#include "ps/Filesystem.h" | #include "ps/Filesystem.h" | ||||
#include "ps/Game.h" | #include "ps/Game.h" | ||||
#include "ps/Globals.h" | #include "ps/Globals.h" | ||||
#include "ps/Hotkey.h" | #include "ps/Hotkey.h" | ||||
#include "ps/Loader.h" | #include "ps/Loader.h" | ||||
#include "ps/Mod.h" | |||||
#include "ps/ModInstaller.h" | #include "ps/ModInstaller.h" | ||||
#include "ps/Profile.h" | #include "ps/Profile.h" | ||||
#include "ps/Profiler2.h" | #include "ps/Profiler2.h" | ||||
#include "ps/Pyrogenesis.h" | #include "ps/Pyrogenesis.h" | ||||
#include "ps/Replay.h" | #include "ps/Replay.h" | ||||
#include "ps/TouchInput.h" | #include "ps/TouchInput.h" | ||||
#include "ps/UserReport.h" | #include "ps/UserReport.h" | ||||
#include "ps/Util.h" | #include "ps/Util.h" | ||||
▲ Show 20 Lines • Show All 530 Lines • ▼ Show 20 Lines | if (!args.Has("mod")) | ||||
CXeromyces::Terminate(); | CXeromyces::Terminate(); | ||||
return; | return; | ||||
} | } | ||||
Paths paths(args); | Paths paths(args); | ||||
g_VFS = CreateVfs(); | g_VFS = CreateVfs(); | ||||
// Mount with highest priority, we don't want mods overwriting this. | // Mount with highest priority, we don't want mods overwriting this. | ||||
g_VFS->Mount(L"cache/", paths.Cache(), VFS_MOUNT_ARCHIVABLE, VFS_MAX_PRIORITY); | g_VFS->Mount(L"cache/", paths.Cache(), VFS_MOUNT_ARCHIVABLE, VFS_MAX_PRIORITY); | ||||
MountMods(paths, GetMods(args, INIT_MODS)); | MountMods(paths, Mod::GetModsFromArguments(args, INIT_MODS)); | ||||
Silier: move check here and even don't mount them when incompatible? | |||||
{ | { | ||||
CReplayPlayer replay; | CReplayPlayer replay; | ||||
replay.Load(replayFile); | replay.Load(replayFile); | ||||
replay.Replay( | replay.Replay( | ||||
args.Has("serializationtest"), | args.Has("serializationtest"), | ||||
args.Has("rejointest") ? args.Get("rejointest").ToInt() : -1, | args.Has("rejointest") ? args.Get("rejointest").ToInt() : -1, | ||||
args.Has("ooslog"), | args.Has("ooslog"), | ||||
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines | else | ||||
if (isUsingRLInterface) | if (isUsingRLInterface) | ||||
StartRLInterface(args); | StartRLInterface(args); | ||||
while (g_Shutdown == ShutdownType::None) | while (g_Shutdown == ShutdownType::None) | ||||
Frame(); | Frame(); | ||||
} | } | ||||
// Do not install mods again in case of restart (typically from the mod selector) | // Do not install mods again in case of restart (typically from the mod selector) | ||||
modsToInstall.clear(); | modsToInstall.clear(); | ||||
Mod::ClearIncompatibleMods(); | |||||
Shutdown(0); | Shutdown(0); | ||||
MainControllerShutdown(); | MainControllerShutdown(); | ||||
flags &= ~INIT_MODS; | flags &= ~INIT_MODS; | ||||
} while (g_Shutdown == ShutdownType::Restart); | } while (g_Shutdown == ShutdownType::Restart); | ||||
#if OS_MACOSX | #if OS_MACOSX | ||||
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines |
Wildfire Games · Phabricator
move check here and even don't mount them when incompatible?