mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Refactor game load functions, resolves #6011

Browse Source
This commit is contained in:
Richard Jenkins
2017-08-23 07:04:36 +01:00
committed by Michael Steenbeek
parent 9aeca18026
commit 71e580a58f
18 changed files with 81 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/FileClassifier.cpp
View File

@@ -25,11 +25,11 @@ extern "C"
#include "util/sawyercoding.h"
}
static bool TryClassifyAsS6(IStream * stream, ClassifiedFile * result);
static bool TryClassifyAsS4(IStream * stream, ClassifiedFile * result);
static bool TryClassifyAsTD4_TD6(IStream * stream, ClassifiedFile * result);
static bool TryClassifyAsS6(IStream * stream, ClassifiedFileInfo * result);
static bool TryClassifyAsS4(IStream * stream, ClassifiedFileInfo * result);
static bool TryClassifyAsTD4_TD6(IStream * stream, ClassifiedFileInfo * result);
bool TryClassifyFile(const std::string &path, ClassifiedFile * result)
bool TryClassifyFile(const std::string &path, ClassifiedFileInfo * result)
{
try
{
@@ -42,7 +42,7 @@ bool TryClassifyFile(const std::string &path, ClassifiedFile * result)
}
}
bool TryClassifyFile(IStream * stream, ClassifiedFile * result)
bool TryClassifyFile(IStream * stream, ClassifiedFileInfo * result)
{
// TODO Currently track designs get classified as SC4s because they use the
// same checksum algorithm. The only way after to tell the difference
@@ -70,7 +70,7 @@ bool TryClassifyFile(IStream * stream, ClassifiedFile * result)
return false;
}
static bool TryClassifyAsS6(IStream * stream, ClassifiedFile * result)
static bool TryClassifyAsS6(IStream * stream, ClassifiedFileInfo * result)
{
bool success = false;
uint64 originalPosition = stream->GetPosition();
@@ -96,7 +96,7 @@ static bool TryClassifyAsS6(IStream * stream, ClassifiedFile * result)
return success;
}
static bool TryClassifyAsS4(IStream * stream, ClassifiedFile * result)
static bool TryClassifyAsS4(IStream * stream, ClassifiedFileInfo * result)
{
uint64 originalPosition = stream->GetPosition();
size_t dataLength = (size_t)stream->GetLength();
@@ -124,7 +124,7 @@ static bool TryClassifyAsS4(IStream * stream, ClassifiedFile * result)
return false;
}
static bool TryClassifyAsTD4_TD6(IStream * stream, ClassifiedFile * result)
static bool TryClassifyAsTD4_TD6(IStream * stream, ClassifiedFileInfo * result)
{
bool success = false;
uint64 originalPosition = stream->GetPosition();