mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix leftover references to SC6

This commit is contained in:
Michael Steenbeek 2022-01-24 20:03:20 +01:00 committed by GitHub
parent 2c7d0a6dd4
commit 4192fc5cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/linux/openrct2-mimeinfo.xml
View File

@ -25,6 +25,7 @@
<glob weight="60" pattern="*.sv6"/> <glob weight="60" pattern="*.sv6"/>
<glob weight="60" pattern="*.sv4"/> <glob weight="60" pattern="*.sv4"/>
<glob weight="60" pattern="*.sv7"/> <glob weight="60" pattern="*.sv7"/>
<glob weight="60" pattern="*.park"/>
</mime-type> </mime-type>
<mime-type type="application/x-openrct2-scenario"> <mime-type type="application/x-openrct2-scenario">

8
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -358,16 +358,16 @@ static bool Browse(bool isSave, char* path, size_t pathSize)
break; break;
case LOADSAVETYPE_LANDSCAPE: case LOADSAVETYPE_LANDSCAPE:
extension = ".sc6"; extension = ".park";
fileType = FILE_EXTENSION_SC6; fileType = FILE_EXTENSION_PARK;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_LANDSCAPE : STR_FILE_DIALOG_TITLE_LOAD_LANDSCAPE; title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_LANDSCAPE : STR_FILE_DIALOG_TITLE_LOAD_LANDSCAPE;
desc.filters[0].name = language_get_string(STR_OPENRCT2_LANDSCAPE_FILE); desc.filters[0].name = language_get_string(STR_OPENRCT2_LANDSCAPE_FILE);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave); desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);
break; break;
case LOADSAVETYPE_SCENARIO: case LOADSAVETYPE_SCENARIO:
extension = ".sc6"; extension = ".park";
fileType = FILE_EXTENSION_SC6; fileType = FILE_EXTENSION_PARK;
title = STR_FILE_DIALOG_TITLE_SAVE_SCENARIO; title = STR_FILE_DIALOG_TITLE_SAVE_SCENARIO;
desc.filters[0].name = language_get_string(STR_OPENRCT2_SCENARIO_FILE); desc.filters[0].name = language_get_string(STR_OPENRCT2_SCENARIO_FILE);
desc.filters[0].pattern = GetFilterPatternByType(_type, isSave); desc.filters[0].pattern = GetFilterPatternByType(_type, isSave);

4
src/openrct2/Game.cpp
View File

@ -609,7 +609,7 @@ static void limit_autosave_count(const size_t numberOfFilesToKeep, bool processL
if (processLandscapeFolder) if (processLandscapeFolder)
{ {
folderDirectory = environment->GetDirectoryPath(DIRBASE::USER, DIRID::LANDSCAPE); folderDirectory = environment->GetDirectoryPath(DIRBASE::USER, DIRID::LANDSCAPE);
fileFilter = "autosave_*.sc6"; fileFilter = "autosave_*.park";
} }
utf8 filter[MAX_PATH]; utf8 filter[MAX_PATH];
@ -671,7 +671,7 @@ void game_autosave()
if (gScreenFlags & SCREEN_FLAGS_EDITOR) if (gScreenFlags & SCREEN_FLAGS_EDITOR)
{ {
subDirectory = "landscape"; subDirectory = "landscape";
fileExtension = ".sc6"; fileExtension = ".park";
saveFlags |= 2; saveFlags |= 2;
} }

2
src/openrct2/platform/Platform.Win32.cpp
View File

@ -365,6 +365,7 @@ namespace Platform
void SetUpFileAssociations() void SetUpFileAssociations()
{ {
// Setup file extensions // Setup file extensions
SetUpFileAssociation(".park", "OpenRCT2 park (.park)", "Play", "\"%1\"", 0);
SetUpFileAssociation(".sc4", "RCT1 Scenario (.sc4)", "Play", "\"%1\"", 0); SetUpFileAssociation(".sc4", "RCT1 Scenario (.sc4)", "Play", "\"%1\"", 0);
SetUpFileAssociation(".sc6", "RCT2 Scenario (.sc6)", "Play", "\"%1\"", 0); SetUpFileAssociation(".sc6", "RCT2 Scenario (.sc6)", "Play", "\"%1\"", 0);
SetUpFileAssociation(".sv4", "RCT1 Saved Game (.sc4)", "Play", "\"%1\"", 0); SetUpFileAssociation(".sv4", "RCT1 Saved Game (.sc4)", "Play", "\"%1\"", 0);
@ -510,6 +511,7 @@ namespace Platform
void RemoveFileAssociations() void RemoveFileAssociations()
{ {
// Remove file extensions // Remove file extensions
RemoveFileAssociation(".park");
RemoveFileAssociation(".sc4"); RemoveFileAssociation(".sc4");
RemoveFileAssociation(".sc6"); RemoveFileAssociation(".sc6");
RemoveFileAssociation(".sv4"); RemoveFileAssociation(".sv4");

2
src/openrct2/title/TitleSequence.cpp
View File

@ -291,7 +291,7 @@ static std::vector<std::string> GetSaves(const std::string& directory)
{ {
std::vector<std::string> saves; std::vector<std::string> saves;
auto pattern = Path::Combine(directory, "*.sc6;*.sv6"); auto pattern = Path::Combine(directory, "*.sc6;*.sv6;*.park;*.sv4;*.sc4");
auto scanner = Path::ScanDirectory(pattern, true); auto scanner = Path::ScanDirectory(pattern, true);
while (scanner->Next()) while (scanner->Next())
{ {