diff --git a/projects/openrct2.sln b/projects/openrct2.sln index 4bdb4ac96e..f176b7813f 100644 --- a/projects/openrct2.sln +++ b/projects/openrct2.sln @@ -1,28 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.30110.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2", "openrct2.vcxproj", "{D24D94F6-2A74-480C-B512-629C306CE92F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Win32.ActiveCfg = Debug|Win32 {D24D94F6-2A74-480C-B512-629C306CE92F}.Debug|Win32.Build.0 = Debug|Win32 - {D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Any CPU.ActiveCfg = Release|Win32 - {D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Mixed Platforms.Build.0 = Release|Win32 {D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.ActiveCfg = Release|Win32 {D24D94F6-2A74-480C-B512-629C306CE92F}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/src/config.c b/src/config.c index beef6f6dc9..af8ac6ca44 100644 --- a/src/config.c +++ b/src/config.c @@ -147,6 +147,7 @@ void config_save() configuration_t gConfig; +static char *config_show_directory_browser(); static void config_parse_settings(FILE *fp); static int config_get_line(FILE *fp, char *setting, char *value); static int config_parse_setting(FILE *fp, char *setting); @@ -170,7 +171,7 @@ void config_init() DWORD dwAttrib = GetFileAttributes(path); if (dwAttrib == INVALID_FILE_ATTRIBUTES || !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY)) { // folder does not exist if (!CreateDirectory(path, NULL)) { - config_error("Could not create config file (do you have write acces to you documents folder?)"); + config_error("Could not create config file (do you have write access to your documents folder?)"); } } strcat(path, "\\config.ini"); @@ -230,7 +231,7 @@ static void config_create_default(char *path) if (!config_find_rct2_path(gConfig.game_path)) { MessageBox(NULL, "Unable to find RCT2 installation directory. Please select the directoy where you installed RCT2!", "OpenRCT2", MB_OK); - char *res = directory_browser(); + char *res = config_show_directory_browser(); strcpy(gConfig.game_path, res); } @@ -242,8 +243,10 @@ static void config_create_default(char *path) fclose(fp); } -//A directory browser allowing for semi-automatic config.ini for non standard installs -char* directory_browser() +/** + * A directory browser allowing for semi-automatic config.ini for non standard installs. + */ +static char *config_show_directory_browser() { BROWSEINFO bi; char pszBuffer[MAX_PATH]; @@ -251,16 +254,14 @@ char* directory_browser() LPMALLOC lpMalloc; // Initialize COM - if (CoInitializeEx(0, COINIT_APARTMENTTHREADED) != S_OK) - { + if (CoInitializeEx(0, COINIT_APARTMENTTHREADED) != S_OK) { MessageBox(NULL, _T("Error opening browse window"), _T("ERROR"), MB_OK); CoUninitialize(); return 0; } // Get a pointer to the shell memory allocator - if (SHGetMalloc(&lpMalloc) != S_OK) - { + if (SHGetMalloc(&lpMalloc) != S_OK) { MessageBox(NULL, _T("Error opening browse window"), _T("ERROR"), MB_OK); CoUninitialize(); return 0; @@ -276,16 +277,12 @@ char* directory_browser() char *outPath = "C:\\"; - if (pidl = SHBrowseForFolder(&bi)) - { + if (pidl = SHBrowseForFolder(&bi)) { // Copy the path directory to the buffer - if (SHGetPathFromIDList(pidl, pszBuffer)) - { - // store pszBuffer (and the path) in the outPath + if (SHGetPathFromIDList(pidl, pszBuffer)) { + // Store pszBuffer (and the path) in the outPath outPath = strcat("", pszBuffer); - } - } CoUninitialize(); return outPath; diff --git a/src/config.h b/src/config.h index a071aba390..65ee7b4752 100644 --- a/src/config.h +++ b/src/config.h @@ -81,7 +81,6 @@ extern uint16 gShortcutKeys[SHORTCUT_COUNT]; void config_reset_shortcut_keys(); void config_load(); void config_save(); -char* directory_browser(); // New config format diff --git a/src/rct2.c b/src/rct2.c index 696769cc63..be54cd7306 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -151,7 +151,7 @@ void rct2_init_directories() // check install directory DWORD dwAttrib = GetFileAttributes(gConfig.game_path); if (dwAttrib == INVALID_FILE_ATTRIBUTES || !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY)) { - MessageBox(NULL, "Invalid RCT2 installation path. Please delete config.ini and run OpenRTC2 again.", "OpenRCT2", MB_OK); + MessageBox(NULL, "Invalid RCT2 installation path. Please correct in config.ini.", "OpenRCT2", MB_OK); exit(-1); }