From 8c1ed596ced02ff1206d7cbdc169f992f04ef771 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sat, 2 Jun 2018 13:50:46 +0200 Subject: [PATCH] Apply review changes - Print warning/error code in log message - Remove attribute from Object::SetSourceGame which has a FIXME comment already instead --- src/openrct2/object/Object.cpp | 2 +- src/openrct2/object/ObjectFactory.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 564e525ca3..3c122b57c1 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -100,7 +100,7 @@ rct_object_entry Object::CreateHeader(const char name[DAT_NAME_LENGTH + 1], uint 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. /*_objectEntry.flags &= 0x0F; diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index a5352fa656..3c30285927 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -129,23 +129,23 @@ public: return {}; } - void LogWarning([[maybe_unused]] uint32 code, const utf8* text) override + void LogWarning(uint32 code, const utf8* text) override { _wasWarning = true; 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; 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); } } };