mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Fix #5603: Game fails on startup (#5604)

Browse Source 
The game tries to use a ui context while setting up a platform environment. Let the platform environment be created before looking for the RCT2 directory. This is a bit hacky at the moment, but a necessary fix until it can be cleaned up.
This commit is contained in:
Ted John
2017-06-13 00:38:56 +01:00
committed by GitHub
parent cf6f497cde
commit f76ca6ea8b
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/Context.cpp
View File

@@ -170,6 +170,12 @@ namespace OpenRCT2
config_save_default(); config_save_default();
} }
if (!rct2_init_directories() || !rct2_startup_checks())
{
return false;
}
_env->SetBasePath(DIRBASE::RCT2, gRCT2AddressAppPath);
if (!gOpenRCT2Headless) if (!gOpenRCT2Headless)
{ {
GetContext()->GetUiContext()->CreateWindow(); GetContext()->GetUiContext()->CreateWindow();

23
src/openrct2/PlatformEnvironment.cpp
View File

@@ -85,6 +85,11 @@ public:
return std::string(path); return std::string(path);
} }
void SetBasePath(DIRBASE base, const std::string &path) override
{
_basePath[(size_t)base] = path;
}
private: private:
static const char * DirectoryNamesRCT2[]; static const char * DirectoryNamesRCT2[];
static const char * DirectoryNamesOpenRCT2[]; static const char * DirectoryNamesOpenRCT2[];
@@ -113,27 +118,9 @@ IPlatformEnvironment * OpenRCT2::CreatePlatformEnvironment()
config_set_defaults(); config_set_defaults();
if (!config_open_default()) if (!config_open_default())
{ {
if (!config_find_or_browse_install_directory())
{
gConfigGeneral.last_run_version = String::Duplicate(OPENRCT2_VERSION);
config_save_default();
utf8 path[MAX_PATH];
config_get_default_path(path, sizeof(path));
Console::Error::WriteLine("An RCT2 install directory must be specified! Please edit \"game_path\" in %s.", path);
return nullptr;
}
config_save_default(); config_save_default();
} }
if (!rct2_init_directories())
{
return nullptr;
}
if (!rct2_startup_checks())
{
return nullptr;
}
utf8 path[260]; utf8 path[260];
std::string basePaths[4]; std::string basePaths[4];
basePaths[(size_t)DIRBASE::RCT1] = String::ToStd(gConfigGeneral.rct1_path); basePaths[(size_t)DIRBASE::RCT1] = String::ToStd(gConfigGeneral.rct1_path);

1
src/openrct2/PlatformEnvironment.h
View File

@@ -73,6 +73,7 @@ namespace OpenRCT2
virtual std::string GetDirectoryPath(DIRBASE base) const abstract; virtual std::string GetDirectoryPath(DIRBASE base) const abstract;
virtual std::string GetDirectoryPath(DIRBASE base, DIRID did) const abstract; virtual std::string GetDirectoryPath(DIRBASE base, DIRID did) const abstract;
virtual std::string GetFilePath(PATHID pathid) const abstract; virtual std::string GetFilePath(PATHID pathid) const abstract;
virtual void SetBasePath(DIRBASE base, const std::string &path) abstract;
}; };
IPlatformEnvironment * CreatePlatformEnvironment(DIRBASE_VALUES basePaths); IPlatformEnvironment * CreatePlatformEnvironment(DIRBASE_VALUES basePaths);

2
src/openrct2/rct2.c
View File

@@ -195,7 +195,7 @@ sint32 rct2_init_directories()
if (!config_find_or_browse_install_directory()) { if (!config_find_or_browse_install_directory()) {
utf8 path[MAX_PATH]; utf8 path[MAX_PATH];
config_get_default_path(path, sizeof(path)); config_get_default_path(path, sizeof(path));
log_fatal("Invalid RCT2 installation path. Please correct \"game_path\" in %s.", path); fprintf(stderr, "An RCT2 install directory must be specified! Please edit \"game_path\" in %s.\n", path);
return 0; return 0;
} }
} }