From 7795ec35dddc22eae8271e0873bb788c92e43f0a Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 20 Sep 2017 22:21:19 +0200 Subject: [PATCH] Add assertions to Intent --- src/openrct2/windows/Intent.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/openrct2/windows/Intent.cpp b/src/openrct2/windows/Intent.cpp index 70c52654e9..29a23b48eb 100644 --- a/src/openrct2/windows/Intent.cpp +++ b/src/openrct2/windows/Intent.cpp @@ -1,4 +1,5 @@ #include "Intent.h" +#include "../core/Guard.hpp" Intent::Intent(rct_windowclass windowclass) { @@ -56,25 +57,29 @@ rct_windowclass Intent::GetWindowClass() void * Intent::GetPointerExtra(uint32 key) { - auto data = _Data.at(key); + auto data = _Data.at(key); + openrct2_assert(data.type == IntentData::DT_POINTER, "Actual type doesn't match requested type"); return (void *) data.pointerVal; } uint32 Intent::GetUIntExtra(uint32 key) { - auto data = _Data.at(key); + auto data = _Data.at(key); + openrct2_assert(data.type == IntentData::DT_UINT, "Actual type doesn't match requested type"); return data.uintVal; } sint32 Intent::GetSIntExtra(uint32 key) { - auto data = _Data.at(key); + auto data = _Data.at(key); + openrct2_assert(data.type == IntentData::DT_SINT, "Actual type doesn't match requested type"); return data.sintVal; } utf8string Intent::GetStringExtra(uint32 key) { - auto data = _Data.at(key); + auto data = _Data.at(key); + openrct2_assert(data.type == IntentData::DT_STRING, "Actual type doesn't match requested type"); return data.stringVal; }