From 7d0abaf2563f98d3df5bb63f15ef258fcbdaee12 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 25 Aug 2023 19:22:25 +0200 Subject: [PATCH] Fix not setting menuData when converting IW5 menus --- src/Common/Game/IW5/IW5_Assets.h | 8 ++++---- src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Common/Game/IW5/IW5_Assets.h b/src/Common/Game/IW5/IW5_Assets.h index 628ce47f..9b073b0d 100644 --- a/src/Common/Game/IW5/IW5_Assets.h +++ b/src/Common/Game/IW5/IW5_Assets.h @@ -2568,9 +2568,9 @@ namespace IW5 WINDOW_FLAG_AUTO_WRAPPED = 0x800000, WINDOW_FLAG_POPUP = 0x1000000, WINDOW_FLAG_LEGACY_SPLIT_SCREEN_SCALE = 0x4000000, - WINDOW_FLAG_HIDDEN_DURING_FLASH_BANG = 0x10000000, - WINDOW_FLAG_HIDDEN_DURING_SCOPE = 0x20000000, - WINDOW_FLAG_HIDDEN_DURING_UI = 0x40000000, + WINDOW_FLAG_HIDDEN_DURING_FLASH_BANG = 0x10000000, // confirmed + WINDOW_FLAG_HIDDEN_DURING_SCOPE = 0x20000000, // confirmed + WINDOW_FLAG_HIDDEN_DURING_UI = 0x40000000, // confirmed WINDOW_FLAG_TEXT_ONLY_FOCUS = 0x80000000, }; @@ -2579,7 +2579,7 @@ namespace IW5 { WINDOW_FLAG_HOVERED = 0x1, // guessed WINDOW_FLAG_FOCUSED = 0x2, - WINDOW_FLAG_VISIBLE = 0x4, + WINDOW_FLAG_VISIBLE = 0x4, // confirmed WINDOW_FLAG_FADING_OUT = 0x10, WINDOW_FLAG_FADING_IN = 0x20, WINDOW_FLAG_80 = 0x80, diff --git a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp index 3da84150..d056c7b3 100644 --- a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp +++ b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp @@ -1067,6 +1067,7 @@ namespace IW5 auto* menuData = m_memory->Create(); memset(menu, 0, sizeof(menuDef_t)); + menu->data = menuData; menu->window.name = m_memory->Dup(commonMenu.m_name.c_str()); menuData->fullScreen = commonMenu.m_full_screen; ApplyFlag(menu->window.staticFlags, commonMenu.m_screen_space, WINDOW_FLAG_SCREEN_SPACE);