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

Apply review changes 

- Print warning/error code in log message
- Remove attribute from Object::SetSourceGame which has a FIXME comment already instead
This commit is contained in:
Hielke Morsink 2018-06-02 13:50:46 +02:00 committed by Michał Janiszewski
parent 204dd4439b
commit 8c1ed596ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ rct_object_entry Object::CreateHeader(const char name[DAT_NAME_LENGTH + 1], uint
return header; return header;
} }
void Object::SetSourceGame([[maybe_unused]] const uint8 sourceGame) void Object::SetSourceGame(const uint8 sourceGame)
{ {
// FIXME: Temporary disabled because it breaks exporting to vanilla. // FIXME: Temporary disabled because it breaks exporting to vanilla.
/*_objectEntry.flags &= 0x0F; /*_objectEntry.flags &= 0x0F;

8
src/openrct2/object/ObjectFactory.cpp
View File

@ -129,23 +129,23 @@ public:
return {}; return {};
} }
void LogWarning([[maybe_unused]] uint32 code, const utf8* text) override void LogWarning(uint32 code, const utf8* text) override
{ {
_wasWarning = true; _wasWarning = true;
if (!String::IsNullOrEmpty(text)) if (!String::IsNullOrEmpty(text))
{ {
Console::Error::WriteLine("[%s] Warning: %s", _objectName.c_str(), text); Console::Error::WriteLine("[%s] Warning (%d): %s", _objectName.c_str(), code, text);
} }
} }
void LogError([[maybe_unused]] uint32 code, const utf8* text) override void LogError(uint32 code, const utf8* text) override
{ {
_wasError = true; _wasError = true;
if (!String::IsNullOrEmpty(text)) if (!String::IsNullOrEmpty(text))
{ {
Console::Error::WriteLine("[%s] Error: %s", _objectName.c_str(), text); Console::Error::WriteLine("[%s] Error (%d): %s", _objectName.c_str(), code, text);
} }
} }
}; };