zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix not setting menuData when converting IW5 menus

Browse Source
This commit is contained in:
Jan 2023-08-25 19:22:25 +02:00
parent cd5a5c2898
commit 7d0abaf256
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Common/Game/IW5/IW5_Assets.h
View File

@ -2568,9 +2568,9 @@ namespace IW5
WINDOW_FLAG_AUTO_WRAPPED = 0x800000, WINDOW_FLAG_AUTO_WRAPPED = 0x800000,
WINDOW_FLAG_POPUP = 0x1000000, WINDOW_FLAG_POPUP = 0x1000000,
WINDOW_FLAG_LEGACY_SPLIT_SCREEN_SCALE = 0x4000000, WINDOW_FLAG_LEGACY_SPLIT_SCREEN_SCALE = 0x4000000,
WINDOW_FLAG_HIDDEN_DURING_FLASH_BANG = 0x10000000, WINDOW_FLAG_HIDDEN_DURING_FLASH_BANG = 0x10000000, // confirmed
WINDOW_FLAG_HIDDEN_DURING_SCOPE = 0x20000000, WINDOW_FLAG_HIDDEN_DURING_SCOPE = 0x20000000, // confirmed
WINDOW_FLAG_HIDDEN_DURING_UI = 0x40000000, WINDOW_FLAG_HIDDEN_DURING_UI = 0x40000000, // confirmed
WINDOW_FLAG_TEXT_ONLY_FOCUS = 0x80000000, WINDOW_FLAG_TEXT_ONLY_FOCUS = 0x80000000,
}; };
@ -2579,7 +2579,7 @@ namespace IW5
{ {
WINDOW_FLAG_HOVERED = 0x1, // guessed WINDOW_FLAG_HOVERED = 0x1, // guessed
WINDOW_FLAG_FOCUSED = 0x2, WINDOW_FLAG_FOCUSED = 0x2,
WINDOW_FLAG_VISIBLE = 0x4, WINDOW_FLAG_VISIBLE = 0x4, // confirmed
WINDOW_FLAG_FADING_OUT = 0x10, WINDOW_FLAG_FADING_OUT = 0x10,
WINDOW_FLAG_FADING_IN = 0x20, WINDOW_FLAG_FADING_IN = 0x20,
WINDOW_FLAG_80 = 0x80, WINDOW_FLAG_80 = 0x80,

1
src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp
View File

@ -1067,6 +1067,7 @@ namespace IW5
auto* menuData = m_memory->Create<menuData_t>(); auto* menuData = m_memory->Create<menuData_t>();
memset(menu, 0, sizeof(menuDef_t)); memset(menu, 0, sizeof(menuDef_t));
menu->data = menuData;
menu->window.name = m_memory->Dup(commonMenu.m_name.c_str()); menu->window.name = m_memory->Dup(commonMenu.m_name.c_str());
menuData->fullScreen = commonMenu.m_full_screen; menuData->fullScreen = commonMenu.m_full_screen;
ApplyFlag(menu->window.staticFlags, commonMenu.m_screen_space, WINDOW_FLAG_SCREEN_SPACE); ApplyFlag(menu->window.staticFlags, commonMenu.m_screen_space, WINDOW_FLAG_SCREEN_SPACE);