From 70ee22bbfadb55a72987e4573a212c48539aa43d Mon Sep 17 00:00:00 2001 From: ZehMatt Date: Sun, 10 Dec 2017 10:06:59 +0100 Subject: [PATCH] Discard empty errors. --- src/openrct2/actions/GameAction.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 7c31595c1b..d66d493058 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -88,6 +88,10 @@ namespace GameActions { result = factory(); } + else + { + log_error("Attempting to create unregistered gameaction: %u\n", id); + } } Guard::ArgumentNotNull(result); return std::unique_ptr(result); @@ -227,7 +231,8 @@ namespace GameActions if (result->Error != GA_ERROR::OK && !(flags & GAME_COMMAND_FLAG_GHOST) && - !(flags & GAME_COMMAND_FLAG_5)) + !(flags & GAME_COMMAND_FLAG_5) && + result->ErrorMessage != STR_NONE) { // Show the error box std::copy(result->ErrorMessageArgs.begin(), result->ErrorMessageArgs.end(), gCommonFormatArgs);