From e56fa67e4637e9ba6bdb0e0e98d498ac1c17239a Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 24 Sep 2023 10:30:03 +0200 Subject: [PATCH] Fix not setting dataType when loading menus --- src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp | 1 + src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp index ecd91299..1d79e5fb 100644 --- a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp +++ b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp @@ -944,6 +944,7 @@ namespace IW4 ApplyFlag(item->window.staticFlags, commonItem.m_auto_wrapped, WINDOW_FLAG_AUTO_WRAPPED); ApplyFlag(item->window.staticFlags, commonItem.m_horizontal_scroll, WINDOW_FLAG_HORIZONTAL_SCROLL); item->type = ConvertItemType(commonItem.m_type); + item->dataType = item->type; item->window.border = commonItem.m_border; item->window.borderSize = static_cast(commonItem.m_border_size); item->visibleExp = ConvertVisibleExpression(&item->window, commonItem.m_visible_expression.get(), &parentMenu, &commonItem); diff --git a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp index d056c7b3..503373b9 100644 --- a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp +++ b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp @@ -948,6 +948,7 @@ namespace IW5 ApplyFlag(item->window.staticFlags, commonItem.m_auto_wrapped, WINDOW_FLAG_AUTO_WRAPPED); ApplyFlag(item->window.staticFlags, commonItem.m_horizontal_scroll, WINDOW_FLAG_HORIZONTAL_SCROLL); item->type = ConvertItemType(commonItem.m_type); + item->dataType = item->type; item->window.border = commonItem.m_border; item->window.borderSize = static_cast(commonItem.m_border_size); item->visibleExp = ConvertVisibleExpression(&item->window, commonItem.m_visible_expression.get(), &parentMenu, &commonItem);