mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix build issues
This commit is contained in:
parent
bb62bbebb3
commit
44120b2e7e
|
@ -114,7 +114,7 @@ namespace SawyerEncoding
|
|||
do
|
||||
{
|
||||
uint8 buffer[4096];
|
||||
uint64 bufferSize = Math::Min(dataSize, sizeof(buffer));
|
||||
uint64 bufferSize = Math::Min<uint64>(dataSize, sizeof(buffer));
|
||||
stream->Read(buffer, bufferSize);
|
||||
|
||||
for (uint64 i = 0; i < bufferSize; i++)
|
||||
|
|
|
@ -62,10 +62,15 @@ class S6Importer final : public IParkImporter
|
|||
{
|
||||
private:
|
||||
const utf8 * _s6Path = nullptr;
|
||||
rct_s6_data _s6 = { 0 };
|
||||
rct_s6_data _s6;
|
||||
uint8 _gameVersion = 0;
|
||||
|
||||
public:
|
||||
S6Importer()
|
||||
{
|
||||
Memory::Set(&_s6, 0, sizeof(_s6));
|
||||
}
|
||||
|
||||
void Load(const utf8 * path) override
|
||||
{
|
||||
const utf8 * extension = Path::GetExtension(path);
|
||||
|
@ -97,7 +102,7 @@ public:
|
|||
_s6Path = path;
|
||||
}
|
||||
|
||||
void LoadFromStream(IStream * stream, bool isScenario)
|
||||
void LoadFromStream(IStream * stream, bool isScenario) override
|
||||
{
|
||||
if (!gConfigGeneral.allow_loading_with_incorrect_checksum && !SawyerEncoding::ValidateChecksum(stream))
|
||||
{
|
||||
|
@ -159,7 +164,7 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
void Import()
|
||||
void Import() override
|
||||
{
|
||||
Initialise();
|
||||
|
||||
|
|
|
@ -165,7 +165,7 @@ extern "C"
|
|||
if (handle != nullptr)
|
||||
{
|
||||
Memory::Free(handle->HintPath);
|
||||
delete handle->Stream;
|
||||
delete ((IStream *)handle->Stream);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -375,7 +375,7 @@ private:
|
|||
*/
|
||||
bool LoadParkFromStream(IStream * stream, const std::string &hintPath)
|
||||
{
|
||||
log_verbose("TitleSequencePlayer::LoadParkFromStream(%s)", hintPath);
|
||||
log_verbose("TitleSequencePlayer::LoadParkFromStream(%s)", hintPath.c_str());
|
||||
bool success = false;
|
||||
try
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue