mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Close #13630: Refactor DATATYPE into strong enum

Browse Source
This commit is contained in:
Tulio Leao
2020-12-23 00:54:01 -03:00
parent b7f70ab20b
commit d6ebdded6b
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/windows/Intent.cpp
View File

@@ -22,7 +22,7 @@ Intent* Intent::putExtra(uint32_t key, uint32_t value)
{ {
IntentData data = {}; IntentData data = {};
data.intVal.unsignedInt = value; data.intVal.unsignedInt = value;
data.type = IntentData::DT_INT; data.type = IntentData::DataType::Int;
_Data.insert(std::make_pair(key, data)); _Data.insert(std::make_pair(key, data));
@@ -33,7 +33,7 @@ Intent* Intent::putExtra(uint32_t key, void* value)
{ {
IntentData data = {}; IntentData data = {};
data.pointerVal = value; data.pointerVal = value;
data.type = IntentData::DT_POINTER; data.type = IntentData::DataType::Pointer;
_Data.insert(std::make_pair(key, data)); _Data.insert(std::make_pair(key, data));
@@ -44,7 +44,7 @@ Intent* Intent::putExtra(uint32_t key, int32_t value)
{ {
IntentData data = {}; IntentData data = {};
data.intVal.signedInt = value; data.intVal.signedInt = value;
data.type = IntentData::DT_INT; data.type = IntentData::DataType::Int;
_Data.insert(std::make_pair(key, data)); _Data.insert(std::make_pair(key, data));
@@ -55,7 +55,7 @@ Intent* Intent::putExtra(uint32_t key, std::string value)
{ {
IntentData data = {}; IntentData data = {};
data.stringVal = std::move(value); data.stringVal = std::move(value);
data.type = IntentData::DT_STRING; data.type = IntentData::DataType::String;
_Data.insert(std::make_pair(key, data)); _Data.insert(std::make_pair(key, data));
@@ -66,7 +66,7 @@ Intent* Intent::putExtra(uint32_t key, close_callback value)
{ {
IntentData data = {}; IntentData data = {};
data.closeCallbackVal = value; data.closeCallbackVal = value;
data.type = IntentData::DT_CLOSE_CALLBACK; data.type = IntentData::DataType::CloseCallback;
_Data.insert(std::make_pair(key, data)); _Data.insert(std::make_pair(key, data));
@@ -86,7 +86,7 @@ void* Intent::GetPointerExtra(uint32_t key) const
} }
auto data = _Data.at(key); auto data = _Data.at(key);
openrct2_assert(data.type == IntentData::DT_POINTER, "Actual type doesn't match requested type"); openrct2_assert(data.type == IntentData::DataType::Pointer, "Actual type doesn't match requested type");
return static_cast<void*>(data.pointerVal); return static_cast<void*>(data.pointerVal);
} }
@@ -98,7 +98,7 @@ uint32_t Intent::GetUIntExtra(uint32_t key) const
} }
auto data = _Data.at(key); auto data = _Data.at(key);
openrct2_assert(data.type == IntentData::DT_INT, "Actual type doesn't match requested type"); openrct2_assert(data.type == IntentData::DataType::Int, "Actual type doesn't match requested type");
return data.intVal.unsignedInt; return data.intVal.unsignedInt;
} }
@@ -110,7 +110,7 @@ int32_t Intent::GetSIntExtra(uint32_t key) const
} }
auto data = _Data.at(key); auto data = _Data.at(key);
openrct2_assert(data.type == IntentData::DT_INT, "Actual type doesn't match requested type"); openrct2_assert(data.type == IntentData::DataType::Int, "Actual type doesn't match requested type");
return data.intVal.signedInt; return data.intVal.signedInt;
} }
@@ -122,7 +122,7 @@ std::string Intent::GetStringExtra(uint32_t key) const
} }
auto data = _Data.at(key); auto data = _Data.at(key);
openrct2_assert(data.type == IntentData::DT_STRING, "Actual type doesn't match requested type"); openrct2_assert(data.type == IntentData::DataType::String, "Actual type doesn't match requested type");
return data.stringVal; return data.stringVal;
} }
@@ -134,6 +134,6 @@ close_callback Intent::GetCloseCallbackExtra(uint32_t key) const
} }
auto data = _Data.at(key); auto data = _Data.at(key);
openrct2_assert(data.type == IntentData::DT_CLOSE_CALLBACK, "Actual type doesn't match requested type"); openrct2_assert(data.type == IntentData::DataType::CloseCallback, "Actual type doesn't match requested type");
return data.closeCallbackVal; return data.closeCallbackVal;
} }

10
src/openrct2/windows/Intent.h
View File

@@ -17,12 +17,12 @@
struct IntentData struct IntentData
{ {
enum DATATYPE enum class DataType
{ {
DT_INT, Int,
DT_STRING, String,
DT_POINTER, Pointer,
DT_CLOSE_CALLBACK CloseCallback
} type; } type;
union union