mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Revert style change

Browse Source
This commit is contained in:
duncanspumpkin
2021-11-14 16:44:04 +00:00
committed by Gymnasiast
parent 921ae21ad5
commit 6d28b94c05
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/object/Object.cpp
View File

@@ -92,8 +92,10 @@ bool ObjectEntryDescriptor::operator==(const ObjectEntryDescriptor& rhs) const
{
return Entry == rhs.Entry;
}
return Type == rhs.Type && Identifier == rhs.Identifier;
else
{
return Type == rhs.Type && Identifier == rhs.Identifier;
}
}
bool ObjectEntryDescriptor::operator!=(const ObjectEntryDescriptor& rhs) const

6
src/openrct2/object/ObjectRepository.cpp
View File

@@ -612,8 +612,10 @@ private:
// Convert to UTF-8 filename
return String::Convert(normalisedName, CODE_PAGE::CP_1252, CODE_PAGE::CP_UTF8);
}
return std::string(name);
else
{
return std::string(name);
}
}
void WritePackedObject(OpenRCT2::IStream* stream, const rct_object_entry* entry)