From 3717c673ac7b11a74d5bf669ae643e9eca881962 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 02:50:34 +0100 Subject: [PATCH 01/11] reimplement: SHC_3BB0A8C1_0x00431B60 99.9% the 640x480 y store restored, s_ pointers, style pass From gynt's fork branch reimpl/UI-MenuViews-development (99.8% there). One fix: at 640x480 the draft never set DAT_MenuHandlerState::instance.y, which the original stores for both branches (the shared tail store at 0x00431BA3). Style pass: the decimal offsets and box corners, s_ pointers for the 98 edge pictures with their names above them, the casts and `+ -1` gone, tab 62 named in a comment (BuildMenuTabType has no name for it), comments on what the blocks draw. Left: the original zeroes esi before it adds -600 to the screen height, ours the other way round (quick_diff 0.9984); fifteen shapes of the menu-position code (y forms, x locals, a switch, store orders, branch-local y) all tie or lose. Measured in a clean alone build of this branch on main 8125c61c2: 99.9% raw, 92.9% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- .../MenuView_BuildMenu_DoInitial.cpp | 1017 +++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 1018 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp diff --git a/src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp b/src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp new file mode 100644 index 0000000000..ffa7b3b3e1 --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp @@ -0,0 +1,1017 @@ +#include "../BuildMenu.func.hpp" + +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/Game/GameMode2.hpp" +#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" +#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" +#include "OpenSHC/UI/Enums/BuildMenuTabType.hpp" +#include "OpenSHC/string-literals.hpp" + +#include "OpenSHC/Globals/COL_MAGENTA.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_MenuHandlerState.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + + // FUNCTION: STRONGHOLDCRUSADER 0x00431B60 + void BuildMenu::MenuView_BuildMenu_DoInitial() + { + // the build menu sits at the bottom of the screen, at its left edge at 640x480 + int const y = DAT_WindowAndDirectDraw::instance.resolutionY - 600; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_640x480) { + Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; + menu->xPosition = 0; + menu->yPosition = y; + DAT_MenuHandlerState::instance.x = 0; + } else { + int const x = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; + Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; + menu->xPosition = x; + menu->yPosition = y; + DAT_MenuHandlerState::instance.x = x; + } + DAT_MenuHandlerState::instance.y = y; + // the soldiers tab has its own menu picture and edge pictures + if (DAT_GameCore::instance.activeMenuTab.buildMenuTab == OpenSHC::UI::Enums::BMTT_SOLDIERS) { + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(8); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(4); + } + if (DAT_WindowAndDirectDraw::instance.pendingMenuRedraw == 0) { + return; + } + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, DAT_PencilRenderCore::ptr)(0, + DAT_MenuHandlerState::instance.y + 406, DAT_WindowAndDirectDraw::instance.resolutionX - 1, + DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); + DAT_WindowAndDirectDraw::instance.pendingMenuRedraw = 0; + // the edge pictures left and right of the menu, for this resolution + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); + } else { + // "edge_military_1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024r_tgx_005a25a8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 896, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 912, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); + } else { + // "edge_military_1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024r_tgx_005a25a8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 896, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 912, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); + } else { + // "edge_military_1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280r_tgx_005a2578); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1040, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); + } else { + // "edge_military_1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600r_tgx_005a2548); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1200, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); + } else { + // "edge_military_1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280r_tgx_005a2578); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1040, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1440l_tgx_005a2530); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1440l_tgx_005a2530); + } else { + // "edge_military_1440r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1440r_tgx_005a2518); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1120, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); + } else { + // "edge_military_1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920r_tgx_005a24e8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1360, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); + } else { + // "edge_military_1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920r_tgx_005a24e8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1360, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); + } else { + // "edge_military_2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560r_tgx_005a24b8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1680, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); + } else { + // "edge_military_2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560r_tgx_005a24b8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1680, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1366l_tgx_005a24a0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1366l_tgx_005a24a0); + } else { + // "edge_military_1366r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1366r_tgx_005a2488); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1082, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1360l_tgx_005a2470); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1360l_tgx_005a2470); + } else { + // "edge_military_1360r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1360r_tgx_005a2458); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1080, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1680l_tgx_005a2440); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1680l_tgx_005a2440); + } else { + // "edge_military_1680r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1680r_tgx_005a2428); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1240, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge_military_1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); + } else { + // "edge_military_1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600r_tgx_005a2548); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1200, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + } else { + // no picture for a hidden menu or tab 62 (BuildMenuTabType has no name for it) + if (DAT_GameCore::instance.activeMenuTab.buildMenuTab == OpenSHC::UI::Enums::BMTT_MENU_HIDDEN) { + return; + } + if (DAT_GameCore::instance.activeMenuTab.buildMenuTab == 62) { + return; + } + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(9); + } else if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(5); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(0); + } + if (DAT_WindowAndDirectDraw::instance.pendingMenuRedraw == 0) { + return; + } + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, DAT_PencilRenderCore::ptr)(0, + DAT_MenuHandlerState::instance.y + 406, DAT_WindowAndDirectDraw::instance.resolutionX - 1, + DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); + DAT_WindowAndDirectDraw::instance.pendingMenuRedraw = 0; + // the edge pictures left and right of the menu, for this resolution: the editor and siege games + // show the left one on both sides + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 912, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 912, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1040, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1200, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1040, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1440l_tgx_005a2358); + // "edge1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1440l_tgx_005a2358); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1120, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1360, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1360, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1680, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1680, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1366l_tgx_005a2328); + // "edge1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1366l_tgx_005a2328); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1082, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1360l_tgx_005a2318); + // "edge1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1360l_tgx_005a2318); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1080, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1680l_tgx_005a2308); + // "edge1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1680l_tgx_005a2308); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1240, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1200, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + } else { + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); + // "edge1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024r_tgx_005a2418); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 912, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); + // "edge1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1024r_tgx_005a2418); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 912, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); + // "edge1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280r_tgx_005a2408); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1040, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); + // "edge1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600r_tgx_005a23f8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1200, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); + // "edge1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1280r_tgx_005a2408); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1040, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1440l_tgx_005a2358); + // "edge1440r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1440r_tgx_005a23e8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1120, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); + // "edge1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920r_tgx_005a23d8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1360, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); + // "edge1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1920r_tgx_005a23d8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1360, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); + // "edge2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560r_tgx_005a23c8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1680, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); + // "edge2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge2560r_tgx_005a23c8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1680, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1366l_tgx_005a2328); + // "edge1366r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1366r_tgx_005a23b8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1082, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1360l_tgx_005a2318); + // "edge1360r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1360r_tgx_005a23a8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1080, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1680l_tgx_005a2308); + // "edge1680r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1680r_tgx_005a2398); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1240, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); + // "edge1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_edge1600r_tgx_005a23f8); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 1, 1200, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + } + } + } + + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index a105efbb9b..c5da10e92b 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -11079,7 +11079,7 @@ SHC_3BB0A8C1_0x00431990 | 0.0% | Pending SHC_3BB0A8C1_0x00431A90 | 0.0% | Pending -SHC_3BB0A8C1_0x00431B60 | 0.0% | Pending +SHC_3BB0A8C1_0x00431B60 | 99.9% | the 640x480 y store restored, s_ pointers, style pass; one add/xor order SHC_3BB0A8C1_0x00433030 | 0.0% | Pending From bef74aef8a1ec37e688e6425da477a9a524bbd57 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 02:50:34 +0100 Subject: [PATCH 02/11] reimplement: SHC_3BB0A8C1_0x004398B0 96.3% the 640x480 y store restored, s_ pointers, style pass From gynt's fork branch reimpl/UI-MenuViews-development (96.2% there). One fix: at 640x480 the draft never set DAT_MenuHandlerState::instance.y, which the original stores for both branches (the shared tail store at 0x004398F5); with it the prologue's push ebx lands where the original has it. Style pass: decimal offsets, s_ pointers for the edge pictures ((char*), loadGfxAtBufferEnd takes a char*), the redundant parentheses, casts and `+ -1` gone, iVar5 is leftGfx, the pending-redraw test an early return. Left: MSVC keeps the constant 99 in ecx from one resolution block to the next (a `mov ecx, 99` at each block's end), where the original keeps it only inside the first block and stores an immediate everywhere else (quick_diff 0.9791). Moving the 99 stores of the first two blocks out of their tab branches fixes every later block (0.9920) but breaks those two; inverting the tab tests, swapping the stores and other literal types (99L, 99u, 'c', short) all tie. Measured in a clean alone build of this branch on main 8125c61c2: 96.3% raw, 90.7% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- ...nuView_BuildingAndStatusMenu_DoInitial.cpp | 832 ++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 833 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoInitial.cpp diff --git a/src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoInitial.cpp b/src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoInitial.cpp new file mode 100644 index 0000000000..ca9193d583 --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoInitial.cpp @@ -0,0 +1,832 @@ +#include "../BuildingAndStatusMenu.func.hpp" + +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/Game/GameMode2.hpp" +#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" +#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" +#include "OpenSHC/UI/Enums/BuildingsAndStatusMenuTabType.hpp" +#include "OpenSHC/string-literals.hpp" + +#include "OpenSHC/Globals/COL_MAGENTA.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_MenuHandlerState.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + + // FUNCTION: STRONGHOLDCRUSADER 0x004398B0 + void BuildingAndStatusMenu::MenuView_BuildingAndStatusMenu_DoInitial() + { + // the menu sits at the bottom of the screen, pushed off its left edge at 640x480 + int const y = DAT_WindowAndDirectDraw::instance.resolutionY - 600; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_640x480) { + Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; + menu->xPosition = -698; + menu->yPosition = y; + DAT_MenuHandlerState::instance.x = -698; + } else { + int const x = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; + Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; + menu->xPosition = x; + menu->yPosition = y; + DAT_MenuHandlerState::instance.x = x; + } + DAT_MenuHandlerState::instance.y = y; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM) { + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(7); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(3); + } + } else if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(7); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(3); + } + } else if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(6); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, + DAT_TextureRenderCoreObject::ptr)(1); + } + if (DAT_WindowAndDirectDraw::instance.pendingMenuRedraw == 0) { + return; + } + DAT_WindowAndDirectDraw::instance.pendingMenuRedraw = 0; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, DAT_PencilRenderCore::ptr)(0, + DAT_MenuHandlerState::instance.y + 406, DAT_WindowAndDirectDraw::instance.resolutionX - 1, + DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { + int leftGfx; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + // "edge_military_1024l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1024l_tgx_005a25c0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1024l_tgx_005a25c0); + } else { + // "edge_military_1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1024r_tgx_005a25a8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 896, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 912, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + } else { + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + // "edge1024l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1024l_tgx_005a2388); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1024l_tgx_005a2388); + } else { + // "edge1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1024r_tgx_005a2418); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 912, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { + int leftGfx; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + // "edge_military_1024l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1024l_tgx_005a25c0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1024l_tgx_005a25c0); + } else { + // "edge_military_1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1024r_tgx_005a25a8); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 896, + 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 912, + 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + } else { + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + // "edge1024l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1024l_tgx_005a2388); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1024l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1024l_tgx_005a2388); + } else { + // "edge1024r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1024r_tgx_005a2418); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 912, + 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1280l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1280l_tgx_005a2590); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1280l_tgx_005a2590); + } else { + // "edge_military_1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1280r_tgx_005a2578); + } + } else { + // "edge1280l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1280l_tgx_005a2378); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1280l_tgx_005a2378); + } else { + // "edge1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1280r_tgx_005a2408); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1024, + 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1040, + 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1600l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1600l_tgx_005a2560); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1600l_tgx_005a2560); + } else { + // "edge_military_1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1600r_tgx_005a2548); + } + } else { + // "edge1600l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1600l_tgx_005a2368); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1600l_tgx_005a2368); + } else { + // "edge1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1600r_tgx_005a23f8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1184, + 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1200, + 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1280l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1280l_tgx_005a2590); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1280l_tgx_005a2590); + } else { + // "edge_military_1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1280r_tgx_005a2578); + } + } else { + // "edge1280l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1280l_tgx_005a2378); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1280l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1280l_tgx_005a2378); + } else { + // "edge1280r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1280r_tgx_005a2408); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1024, + 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1040, + 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1440l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1440l_tgx_005a2530); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1440l_tgx_005a2530); + } else { + // "edge_military_1440r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1440r_tgx_005a2518); + } + } else { + // "edge1440l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1440l_tgx_005a2358); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1440l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1440l_tgx_005a2358); + } else { + // "edge1440r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1440r_tgx_005a23e8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1104, + 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1120, + 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1920l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1920l_tgx_005a2500); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1920l_tgx_005a2500); + } else { + // "edge_military_1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1920r_tgx_005a24e8); + } + } else { + // "edge1920l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1920l_tgx_005a2348); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1920l_tgx_005a2348); + } else { + // "edge1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1920r_tgx_005a23d8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1344, + 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1360, + 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1920l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1920l_tgx_005a2500); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1920l_tgx_005a2500); + } else { + // "edge_military_1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1920r_tgx_005a24e8); + } + } else { + // "edge1920l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1920l_tgx_005a2348); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1920l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1920l_tgx_005a2348); + } else { + // "edge1920r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1920r_tgx_005a23d8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1344, + 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1360, + 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_2560l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_2560l_tgx_005a24d0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_2560l_tgx_005a24d0); + } else { + // "edge_military_2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_2560r_tgx_005a24b8); + } + } else { + // "edge2560l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge2560l_tgx_005a2338); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge2560l_tgx_005a2338); + } else { + // "edge2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge2560r_tgx_005a23c8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1664, + 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1680, + 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_2560l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_2560l_tgx_005a24d0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_2560l_tgx_005a24d0); + } else { + // "edge_military_2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_2560r_tgx_005a24b8); + } + } else { + // "edge2560l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge2560l_tgx_005a2338); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge2560l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge2560l_tgx_005a2338); + } else { + // "edge2560r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge2560r_tgx_005a23c8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1664, + 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1680, + 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1366l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1366l_tgx_005a24a0); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1366l_tgx_005a24a0); + } else { + // "edge_military_1366r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1366r_tgx_005a2488); + } + } else { + // "edge1366l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1366l_tgx_005a2328); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1366l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1366l_tgx_005a2328); + } else { + // "edge1366r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1366r_tgx_005a23b8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1066, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1082, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1360l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1360l_tgx_005a2470); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1360l_tgx_005a2470); + } else { + // "edge_military_1360r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1360r_tgx_005a2458); + } + } else { + // "edge1360l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1360l_tgx_005a2318); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1360l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1360l_tgx_005a2318); + } else { + // "edge1360r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1360r_tgx_005a23a8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1064, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1080, + 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1680l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1680l_tgx_005a2440); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1680l_tgx_005a2440); + } else { + // "edge_military_1680r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1680r_tgx_005a2428); + } + } else { + // "edge1680l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1680l_tgx_005a2308); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1680l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1680l_tgx_005a2308); + } else { + // "edge1680r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1680r_tgx_005a2398); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1224, + 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1240, + 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { + int leftGfx; + DAT_TextureRenderCoreObject::instance.backwardsLoadedGfxIndex_0x16C850 = 99; + DAT_TextureRenderCoreObject::instance.loadedGfxArray[99].backwardsOffsetInBuffer = 0; + if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + // "edge_military_1600l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1600l_tgx_005a2560); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge_military_1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1600l_tgx_005a2560); + } else { + // "edge_military_1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge_military_1600r_tgx_005a2548); + } + } else { + // "edge1600l.tgx" + leftGfx = MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1600l_tgx_005a2368); + if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { + // "edge1600l.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1600l_tgx_005a2368); + } else { + // "edge1600r.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxAtBufferEnd, + DAT_TextureRenderCoreObject::ptr)((char*)s_edge1600r_tgx_005a23f8); + } + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, DAT_TextureRenderCoreObject::ptr)( + leftGfx, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx].height); + if ((DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR + || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) + && (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM + || DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST)) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1184, + 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)(leftGfx - 1, 1200, + 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[leftGfx - 1].height); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + } + } + + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index c5da10e92b..bea815b16b 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -13391,7 +13391,7 @@ SHC_3BB0A8C1_0x00439730 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00439890 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004398B0 | 0.0% | Pending +SHC_3BB0A8C1_0x004398B0 | 96.3% | the 640x480 y store restored, s_ pointers, style pass; 99 held in ecx through every block SHC_3BB0A8C1_0x0043A850 | 100.0% | Reimplemented From 0d11bd29a673a5051d7bd24deb9c5feec7a775fb Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 02:50:34 +0100 Subject: [PATCH 03/11] reimplement: SHC_3BB0A8C1_0x00426600 83.7% style pass, x before y From gynt's fork branch archive/UI-MenuViews-merged-full (83.7% there). The menu handler's x is stored before its y (quick_diff 0.8372 -> 0.8605, though reccmp still gives the draft's 83.7%). Style pass: iVar2 is offset, borderWidth and borderHeight are locals at first use (borderHeight const), pMVar1 is Menu* const menu, 0x18 is 24, the casts, the unused using and bVar3 go, a comment says what the 24 pixels are. Left: the original holds the border height in eax and the width in ecx, ours the other way round; declaration orders, an inline height, an if / else for the x store and reusing the offset local for the width all tie or lose. Measured in a clean alone build of this branch on main 8125c61c2: 83.7% raw, 66.7% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- ...nuView_UnusedDemoBuyItScreen_DoInitial.cpp | 55 +++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp diff --git a/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp b/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp new file mode 100644 index 0000000000..5f295b78a1 --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp @@ -0,0 +1,55 @@ +#include "../UnusedDemoBuyItScreen.func.hpp" + +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" + +#include "OpenSHC/Globals/COL_BLACK.hpp" +#include "OpenSHC/Globals/DAT_MenuHandlerState.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" +#include "OpenSHC/Globals/INT_00b960e0.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + + // FUNCTION: STRONGHOLDCRUSADER 0x00426600 + void UnusedDemoBuyItScreen::MenuView_UnusedDemoBuyItScreen_DoInitial() + { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, DAT_PencilRenderCore::ptr)(0, + 0, DAT_WindowAndDirectDraw::instance.resolutionX, DAT_WindowAndDirectDraw::instance.resolutionY, + COL_BLACK::instance.shortValue); + // the picture and the menu sit 24 pixels further right at 800x600 + int offset = 0; + INT_00b960e0::instance = 0; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_800x600) { + offset = 24; + INT_00b960e0::instance = 24; + } + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::drawGfxOnFlaggedSurface, + DAT_TextureRenderCoreObject::ptr)(0, + (DAT_WindowAndDirectDraw::instance.resolutionX + - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].width) + / 2 + + offset, + (DAT_WindowAndDirectDraw::instance.resolutionY + - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height) + / 2); + int const borderHeight = DAT_WindowAndDirectDraw::instance.mainMenuBorderHeight; + int borderWidth = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; + Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; + menu->yPosition = borderHeight; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_800x600) { + borderWidth += 24; + } + menu->xPosition = borderWidth; + // x before y (y before x: quick_diff 0.8605 -> 0.8372); the original holds the height in eax, ours in ecx + DAT_MenuHandlerState::instance.x = borderWidth; + DAT_MenuHandlerState::instance.y = borderHeight; + } + + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index bea815b16b..b1e0531dbe 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -6767,7 +6767,7 @@ SHC_3BB0A8C1_0x00426340 | 0.0% | Pending SHC_3BB0A8C1_0x00426570 | 0.0% | Pending -SHC_3BB0A8C1_0x00426600 | 0.0% | Pending +SHC_3BB0A8C1_0x00426600 | 83.7% | style pass, x before y; height and width in swapped registers SHC_3BB0A8C1_0x004266A0 | 100.0% | Reimplemented From c5b5fe6c3c62084e217e63e1974d237b6c60309f Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 02:50:34 +0100 Subject: [PATCH 04/11] reimplement: SHC_3BB0A8C1_0x00440560 98.2% the early return restored, style pass From gynt's fork branch reimpl/UI-MenuViews-development (82.5% there). One fix: when a name was entered before, the original returns right after clearing the two trigger flags (the stores at 0x00440648 and 0x0044064E, the return at 0x00440669); the draft went on to load frontend_combat3.tgx, reset the text and open the name dialog. Style pass: the copy is strcpy with main's 4996 pragma, the lord-name search an index loop over LordNameToCall with a found flag, the length test a for (;;) loop (strlen makes the frame four bytes larger: quick_diff 0.9577 -> 0.9296), TAIT_ZERO, the s_ pointer, the plate comment, casts and unused usings gone. quick_diff 0.9577 is artefacts only, but quick_diff collapses stack slots: reccmp shows the name buffer at [esp + 0xc] where the original has [esp + 0x10] and the cookie 4 bytes off, also in gynt's draft. Buffer sizes 248 to 260, declaration orders and the goto all tie. Measured in a clean alone build of this branch on main 8125c61c2: 98.2% raw, 94.1% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- .../MenuView_GameStartEnterName_Prepare.cpp | 111 ++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/GameStartEnterName/MenuView_GameStartEnterName_Prepare.cpp diff --git a/src/OpenSHC/UI/MenuViews/GameStartEnterName/MenuView_GameStartEnterName_Prepare.cpp b/src/OpenSHC/UI/MenuViews/GameStartEnterName/MenuView_GameStartEnterName_Prepare.cpp new file mode 100644 index 0000000000..662fe1025f --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/GameStartEnterName/MenuView_GameStartEnterName_Prepare.cpp @@ -0,0 +1,111 @@ +// disable deprecation warnings for strcpy +#pragma warning(disable : 4996) + +#include "../GameStartEnterName.func.hpp" + +#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" +#include "OpenSHC/Audio/SFX/SFXState.func.hpp" +#include "OpenSHC/Game/GameCore.func.hpp" +#include "OpenSHC/IO/LowLevelMemory.func.hpp" +#include "OpenSHC/OS.func.hpp" +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/Text/UserTextHandler.func.hpp" +#include "OpenSHC/UI/Helpers.func.hpp" +#include "OpenSHC/UI/MenuModalComposition.func.hpp" +#include "OpenSHC/UI/MenuViews/MainMenu.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/Audio/SFX/SpeechEffectID.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Text/TextArrayIndexType.hpp" +#include "OpenSHC/UI/Enums/MenuModalType.hpp" +#include "OpenSHC/UI/Enums/MenuViewType.hpp" +#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp" +#include "OpenSHC/string-literals.hpp" + +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_LowLevelMemory.hpp" +#include "OpenSHC/Globals/DAT_MenuModalComposition1.hpp" +#include "OpenSHC/Globals/DAT_MenuView_TriggerPrepare.hpp" +#include "OpenSHC/Globals/DAT_SFXState.hpp" +#include "OpenSHC/Globals/DAT_SoundSystemState.hpp" +#include "OpenSHC/Globals/DAT_SpeechDefinedData.hpp" +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_UIDragDropDefinedData.hpp" +#include "OpenSHC/Globals/DAT_UserTextHandlerState.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + + using OpenSHC::WindowsHelper::Enums::BOOLEnum; + + // FUNCTION: STRONGHOLDCRUSADER 0x00440560 + void GameStartEnterName::MenuView_GameStartEnterName_Prepare() + { + // the original reads the local time and drops it + __time64_t now; + MACRO_CALL(OpenSHC::OS_Func::__time64)(&now); + MACRO_CALL(OpenSHC::OS_Func::_localtime)(&now); + // the lord's name, spoken when the game has a recording of it, otherwise the start-game line + char lordName[256]; + strcpy(lordName, + MACRO_CALL_MEMBER( + OpenSHC::Text::UserTextHandler_Func::getTextArrayPointer, DAT_UserTextHandlerState::ptr)(0)); + BOOLEnum named = FALSE; + for (int lord = 0; lord < countof(DAT_SpeechDefinedData::instance.LordNameToCall); ++lord) { + if (MACRO_CALL_MEMBER(OpenSHC::IO::LowLevelMemory_Func::isLordNameCallable, DAT_LowLevelMemory::ptr)( + lordName, DAT_SpeechDefinedData::instance.LordNameToCall[lord].name)) { + MACRO_CALL_MEMBER(OpenSHC::Audio::MSS::SoundSystem_Func::playSoundOnStream3Unk, + DAT_SoundSystemState::ptr)(DAT_SpeechDefinedData::instance.LordNameToCall[lord].source, 1); + named = TRUE; + break; + } + } + if (!named) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSpeechSFX, DAT_SFXState::ptr)( + OpenSHC::Audio::SFX::SEID_GENERAL_STARTGAME); + } + // a name already entered: straight on to the main menu (strlen: quick_diff 0.9577 -> 0.9296) + char* text = MACRO_CALL_MEMBER( + OpenSHC::Text::UserTextHandler_Func::getTextArrayPointer, DAT_UserTextHandlerState::ptr)(0); + char* const start = text + 1; + for (;;) { + char const c = *text++; + if (c == '\0') { + break; + } + } + if (text - start != 0) { + DAT_GameCore::instance.isNameEntryActive = TRUE; + DAT_GameCore::instance.nameEntryStartTime = timeGetTime(); + MACRO_CALL_MEMBER(OpenSHC::Game::GameCore_Func::switchToMenuView, DAT_GameCore::ptr)( + OpenSHC::UI::Enums::MVT_MAIN_MENU, 0); + MACRO_CALL_MEMBER(OpenSHC::Game::GameCore_Func::processMenuViewSwitch, DAT_GameCore::ptr)(); + MACRO_CALL(OpenSHC::UI::MenuViews::MainMenu_Func::MenuView_MainMenu_Prepare)(); + MACRO_CALL(OpenSHC::UI::MenuViews::MainMenu_Func::MenuView_MainMenu_DoInitial)(); + MACRO_CALL(OpenSHC::UI::MenuViews::MainMenu_Func::MenuView_MainMenu_DoEveryFrame)(); + DAT_UIDragDropDefinedData::instance.MenuView_TriggerInitial = FALSE; + DAT_MenuView_TriggerPrepare::instance = FALSE; + return; + } + // otherwise the name entry dialog, filled in with "Lord Crusader" + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + // "frontend_combat3.tgx" + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_frontend_combat3_tgx_005a2134); + MACRO_CALL(OpenSHC::UI::Helpers_Func::LoadTGX_shc_back)(); + DAT_GameCore::instance.isNameEntryActive = FALSE; + MACRO_CALL_MEMBER(OpenSHC::Text::UserTextHandler_Func::resetToTextIndex, DAT_UserTextHandlerState::ptr)( + OpenSHC::Text::TAIT_ZERO); + // "Lord Crusader" + MACRO_CALL_MEMBER(OpenSHC::Text::UserTextHandler_Func::copyIntoTextArray, DAT_UserTextHandlerState::ptr)( + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::getTextStringInGroupAtOffset, + DAT_TextManagerObject::ptr)(OpenSHC::DE::SHCDE::TEXT_GAME_OPTIONS, 48)); + MACRO_CALL_MEMBER(OpenSHC::UI::MenuModalComposition_Func::activateModalDialog, + DAT_MenuModalComposition1::ptr)(OpenSHC::UI::Enums::MMT_ENTER_TITLE_ON_GAME_START, FALSE); + } + + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index b1e0531dbe..5887f54d07 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -13641,7 +13641,7 @@ SHC_3BB0A8C1_0x00440420 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00440430 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x00440560 | 0.0% | Pending +SHC_3BB0A8C1_0x00440560 | 98.2% | the early return restored, style pass; stack slots of the name buffer and the cookie SHC_3BB0A8C1_0x00440600 | 0.0% | Pending From f8b0f683e49e43d9397279cb0a1a0f521bf95727 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 21:03:28 +0100 Subject: [PATCH 05/11] reimplement: SHC_3BB0A8C1_0x00448E90 84.2% own rewrite from the asm with gynt's draft Draft. MenuView_SingleplayerMapChoice_DoEveryFrame fades the map table's background, rebuilds the table's list of maps of the chosen mission type when asked to (selecting and scrolling to the map named in standaloneFilename), and draws the table's box and frame. Written from the original's instructions, with gynt's draft (6abf59884 on his fork's reimpl/UI-MenuViews-development, 83.33% there) for the reads. Fixed: with main's header the draft's DAT_ArrayOfMapIndices[count - 1] and DAT_ArrayOfMapIndices[count + 499] land 4 bytes below the original's stores; the original stores to [count * 4 + 0x01126E28] and [count * 4 + 0x011275F8], which in main's header are DAT_ArrayOfMapIndices[count] and DAT_ArrayOfMapIndices2[count - 1] (as main's SaveLoadMap indexes it). Changed: the stricmp nested around the name lookup, which pushes standaloneFilename first as the original does; strlen for the inline loop; the copy of the name into a 1008-byte buffer with strcpy and strcat (main's 4996 pragma, S__MAP_005A2294); a for loop with continue; the scroll counter a local (in the globals: quick_diff 0.8440 -> 0.7794). Left: the original keeps the scroll counter in edx and stores it and the selection only after the scroll loop, and allocates the box's coordinates to other registers; the loop and coordinate forms tried tie or lose. This file was measured as it stands in a clean alone build of the branch on main eef6f667a: 84.2% raw, 75.1% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- ...iew_SingleplayerMapChoice_DoEveryFrame.cpp | 185 ++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/SingleplayerMapChoice/MenuView_SingleplayerMapChoice_DoEveryFrame.cpp diff --git a/src/OpenSHC/UI/MenuViews/SingleplayerMapChoice/MenuView_SingleplayerMapChoice_DoEveryFrame.cpp b/src/OpenSHC/UI/MenuViews/SingleplayerMapChoice/MenuView_SingleplayerMapChoice_DoEveryFrame.cpp new file mode 100644 index 0000000000..6b695836b2 --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/SingleplayerMapChoice/MenuView_SingleplayerMapChoice_DoEveryFrame.cpp @@ -0,0 +1,185 @@ +// disable deprecation warnings for strcpy and strcat +#pragma warning(disable : 4996) + +#include "../SingleplayerMapChoice.func.hpp" + +#include "OpenSHC/IO/ResourceManager.func.hpp" +#include "OpenSHC/OS.func.hpp" +#include "OpenSHC/UI/Helpers.func.hpp" +#include "OpenSHC/UI/MenuItems/SinglePlayerMapChoice.func.hpp" +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/IO/FileResourceType.hpp" +#include "OpenSHC/Map/MapLockState.hpp" +#include "OpenSHC/Map/MapType2.hpp" +#include "OpenSHC/string-macros.hpp" + +#include "OpenSHC/Globals/COL_VERY_SOFT_YELLOW.hpp" +#include "OpenSHC/Globals/DAT_00b960dc.hpp" +#include "OpenSHC/Globals/DAT_ButtonBackgroundBlendStrength.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp" +#include "OpenSHC/Globals/DAT_MapMissionType.hpp" +#include "OpenSHC/Globals/DAT_MapPropertiesState.hpp" +#include "OpenSHC/Globals/DAT_MenuTextInputState.hpp" +#include "OpenSHC/Globals/DAT_MouseState.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_ResourceManager.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" +#include "OpenSHC/Globals/DWORD_00b95b1c.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + namespace SingleplayerMapChoice { + + // FUNCTION: STRONGHOLDCRUSADER 0x00448E90 + void MenuView_SingleplayerMapChoice_DoEveryFrame() + { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::drawGfxOnFlaggedSurface, + DAT_TextureRenderCoreObject::ptr)(0, + (DAT_WindowAndDirectDraw::instance.resolutionX + - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].width) + / 2, + (DAT_WindowAndDirectDraw::instance.resolutionY + - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height) + / 2); + + // the map table's background fades in (positive) or out (negative) + if (DAT_00b960dc::instance != 0) { + DAT_GameCore::instance.hasMenuRenderedUnk = 1; + if ((int)DAT_00b960dc::instance < 0) { + DAT_ButtonBackgroundBlendStrength::instance = DAT_ButtonBackgroundBlendStrength::instance + - (timeGetTime() - DWORD_00b95b1c::instance) / 40; + if (DAT_ButtonBackgroundBlendStrength::instance <= 0) { + DAT_ButtonBackgroundBlendStrength::instance = 0; + DAT_00b960dc::instance = 0; + } + } else { + DAT_ButtonBackgroundBlendStrength::instance = DAT_ButtonBackgroundBlendStrength::instance + + (timeGetTime() - DWORD_00b95b1c::instance) / 40; + if (DAT_ButtonBackgroundBlendStrength::instance >= 32) { + DAT_ButtonBackgroundBlendStrength::instance = 32; + DAT_GameCore::instance.menuSwitchDelay = 0; + } + } + } + + // list the maps of the chosen mission type, and select the one named in + // standaloneFilename + if (DAT_GameSynchronyState::instance.reparseMaps) { + DAT_GameSynchronyState::instance.reparseMaps = FALSE; + DAT_MouseState::instance.waitCursorToggle = 1; + MACRO_CALL(OpenSHC::UI::Helpers_Func::SetCursorDependingOnProgramState)(); + MACRO_CALL_MEMBER( + OpenSHC::IO::ResourceManager_Func::mapNames_syncLoadedMapNames, DAT_ResourceManager::ptr)(); + int count = 0; + int selected = -1; + for (int id = 0; id < DAT_ResourceManager::instance.mapFileCounter; ++id) { + char fileName[1008]; // the size of the original's buffer + strcpy(fileName, + MACRO_CALL_MEMBER(OpenSHC::IO::ResourceManager_Func::mapNames_getLoadedMapNameForIndex, + DAT_ResourceManager::ptr)(id)); + // ".map" + strcat(fileName, S__MAP_005A2294); + MACRO_CALL_MEMBER(OpenSHC::IO::ResourceManager_Func::resolveResourceFileName, + DAT_ResourceManager::ptr)(OpenSHC::IO::FRT_MAPS, fileName); + MACRO_CALL_MEMBER(OpenSHC::IO::ResourceManager_Func::loadMapMetaByID, DAT_ResourceManager::ptr)( + id); + switch (DAT_MapPropertiesState::instance.scenarioMissionSiegeOrInvasion) { + case OpenSHC::Map::MT_SIEGE: + DAT_MapPropertiesState::instance.scenarionMissionType = 2; + break; + case OpenSHC::Map::MT_INVASION: + DAT_MapPropertiesState::instance.scenarionMissionType = 3; + break; + case OpenSHC::Map::MT_ECONOMIC: + DAT_MapPropertiesState::instance.scenarionMissionType = 1; + break; + case OpenSHC::Map::MT_JUST_BUILD: + DAT_MapPropertiesState::instance.scenarionMissionType = 0; + break; + } + if (DAT_GameCore::instance.mapType != 0 + || DAT_MapPropertiesState::instance.scenarionMissionType != DAT_MapMissionType::instance + || DAT_GameCore::instance.savedMapLocked >= OpenSHC::Map::MLS_MISSION) { + continue; + } + DAT_MenuTextInputState::instance.DAT_ArrayOfMapIndices[count] = id; + DAT_MenuTextInputState::instance.DAT_ArrayOfMapIndices2[count - 1] = id; + DAT_MenuTextInputState::instance.arrayOfMapEndInt2[id] = DAT_GameCore::instance.savedMapEndInt2; + if (MACRO_CALL(OpenSHC::OS_Func::__stricmp)( + MACRO_CALL_MEMBER(OpenSHC::IO::ResourceManager_Func::mapNames_getLoadedMapNameForIndex, + DAT_ResourceManager::ptr)(id), + DAT_GameCore::instance.standaloneFilename) + == 0) { + selected = count; + } + ++count; + } + DAT_MouseState::instance.waitCursorToggle = 0; + DAT_GameSynchronyState::instance.DAT_MapSelectionTotalNumber = count; + int scrollOffset = 0; + DAT_GameSynchronyState::instance.DAT_MapSelectionScrollOffset = scrollOffset; + DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected = -1; + DAT_GameSynchronyState::instance.skirmishRelated1 = 0; + if (count != 0) { + DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected = 0; + if (strlen(DAT_GameCore::instance.standaloneFilename) != 0 && selected >= 0) { + // scrolled so that the selected map is in the table's 13 rows + DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected = selected; + while (DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected >= 13) { + --DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected; + ++scrollOffset; + DAT_GameSynchronyState::instance.DAT_MapSelectionScrollOffset = scrollOffset; + } + } + MACRO_CALL(OpenSHC::UI::MenuItems::SinglePlayerMapChoice_Func:: + MenuItemActionHandler_SingleplayerMapChoice_MapTable)( + DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected); + DAT_GameSynchronyState::instance.skirmishRelated1 = 1; + DAT_GameCore::instance.standaloneFilename[0] = '\0'; + } + DWORD_00b95b1c::instance = timeGetTime(); + } + + // the map table's box, narrower for sieges + int const x = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; + int const y = DAT_WindowAndDirectDraw::instance.mainMenuBorderHeight; + int left = x + 280; + if (DAT_MapMissionType::instance != 2) { + left = x + 140; + } + int const top = y + 253; + int const right = x + 660; + int const bottom = y + 534; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBlendedBlackBox, DAT_PencilRenderCore::ptr)( + left, top, right - 20, bottom, (DAT_ButtonBackgroundBlendStrength::instance - 32) * 16 / 32 + 32); + if (DAT_00b960dc::instance != 0) { + return; + } + // its frame, the header line and the scroll bar's + int const frameLeft = left - 1; + int const frameRight = right + 1; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + frameLeft, top - 1, frameRight, top - 1, COL_VERY_SOFT_YELLOW::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + frameLeft, bottom + 1, frameRight, bottom + 1, COL_VERY_SOFT_YELLOW::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + frameLeft, top + 20, frameRight, top + 20, COL_VERY_SOFT_YELLOW::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + frameLeft, top, frameLeft, bottom, COL_VERY_SOFT_YELLOW::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + frameRight, top, frameRight, bottom, COL_VERY_SOFT_YELLOW::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + right - 20, top, right - 20, bottom, COL_VERY_SOFT_YELLOW::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawLine, DAT_PencilRenderCore::ptr)( + right - 19, bottom - 20, right, bottom - 20, COL_VERY_SOFT_YELLOW::instance.shortValue); + } + + } + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 4b9ab42257..8c731cb6b2 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -16381,7 +16381,7 @@ SHC_3BB0A8C1_0x004489F0 | 0.0% | Pending SHC_3BB0A8C1_0x00448D40 | 0.0% | Pending -SHC_3BB0A8C1_0x00448E90 | 0.0% | Pending +SHC_3BB0A8C1_0x00448E90 | 84.2% | own rewrite from the asm with gynt's draft; the scroll counter's register and the box's register allocation SHC_3BB0A8C1_0x00449274 | 0.0% | Pending From 3480be06c0a3a1115d4fa111bf39642d87e479f7 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 21:03:29 +0100 Subject: [PATCH 06/11] reimplement: SHC_3BB0A8C1_0x004261E0 82.1% gynt's draft in main's style Draft. MenuView_Credits_Prepare loads the credits pictures (or the end credit after the campaign), opens credits.hlp in the scroll dialog, stores the credits' start times and clears the screen. From gynt's draft (458bcd5d8 on his fork's reimpl/UI-MenuViews-development, 80.00% there): main's namespace form, the s_ pointers for the six strings, the section lookup nested in the call, -600 for 0xfffffda8, the casts go. Left: the original keeps 0 in edi for its six zero stores and pushes; ours uses immediates. Typing the three undefined4 globals int, a zero local, !x and the store order do not change that. This file was measured as it stands in a clean alone build of the branch on main eef6f667a: 82.1% raw, 82.1% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- .../Credits/MenuView_Credits_Prepare.cpp | 62 +++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/Credits/MenuView_Credits_Prepare.cpp diff --git a/src/OpenSHC/UI/MenuViews/Credits/MenuView_Credits_Prepare.cpp b/src/OpenSHC/UI/MenuViews/Credits/MenuView_Credits_Prepare.cpp new file mode 100644 index 0000000000..1f93d0bfef --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/Credits/MenuView_Credits_Prepare.cpp @@ -0,0 +1,62 @@ +#include "../Credits.func.hpp" + +#include "OpenSHC/Text/TextEditorState.func.hpp" +#include "OpenSHC/UI/Helpers.func.hpp" +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/string-literals.hpp" + +#include "OpenSHC/Globals/COL_BLACK.hpp" +#include "OpenSHC/Globals/DAT_00b95954.hpp" +#include "OpenSHC/Globals/DAT_00b95b3c.hpp" +#include "OpenSHC/Globals/DAT_00b95b70.hpp" +#include "OpenSHC/Globals/DAT_00b9610c.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_TextEditorState.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" +#include "OpenSHC/Globals/INT_00b960d0.hpp" +#include "OpenSHC/Globals/INT_00b960d4.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + namespace Credits { + + // FUNCTION: STRONGHOLDCRUSADER 0x004261E0 + void MenuView_Credits_Prepare() + { + DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; + if (DAT_00b95954::instance == 0) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_credits_1_tgx_005a20e8); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_credits_2_tgx_005a20d8); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_credits_3_tgx_005a20c8); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_credits_4_tgx_005a20b8); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, + DAT_TextureRenderCoreObject::ptr)(s_end_credit_tgx_005a20a8); + } + MACRO_CALL_MEMBER( + OpenSHC::Text::TextEditorState_Func::openCreditsScrollDialog, DAT_TextEditorState::ptr)( + MACRO_CALL_MEMBER(OpenSHC::Text::TextEditorState_Func::findOrAddHelpSectionName, + DAT_TextEditorState::ptr)((char*)s_credits_hlp_005a209c)); + DAT_TextEditorState::instance.helpContentScrollOffsetY = -600; + DAT_00b95b3c::instance = 0; + INT_00b960d0::instance = timeGetTime(); + DAT_00b95b70::instance = 0; + DAT_00b9610c::instance = 1; + MACRO_CALL(OpenSHC::UI::Helpers_Func::LoadTGX_shc_back)(); + INT_00b960d4::instance = timeGetTime(); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, + DAT_PencilRenderCore::ptr)(0, 0, DAT_WindowAndDirectDraw::instance.resolutionX, + DAT_WindowAndDirectDraw::instance.resolutionY, COL_BLACK::instance.shortValue); + } + + } + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 8c731cb6b2..6da3db0bd8 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -6759,7 +6759,7 @@ SHC_3BB0A8C1_0x00425FF0 | 0.0% | Pending SHC_3BB0A8C1_0x00426060 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004261E0 | 0.0% | Pending +SHC_3BB0A8C1_0x004261E0 | 82.1% | gynt's draft in main's style; the original keeps 0 in edi SHC_3BB0A8C1_0x004262B0 | 0.0% | Pending From 8509cd2e58b900a6aff23578fcb2e39046f67e69 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 22:46:16 +0100 Subject: [PATCH 07/11] reimplement: SHC_3BB0A8C1_0x004494E0 72.9% gynt's draft in the original's arm order Draft. MenuView_BuildingAndStatusMenu_DoEveryFrame draws the building and status menu's panel for the open tab and resolution, then the open building's menu (one switch arm per building, 88 of them) and, unless a video plays or at 640x480, the minimap. From gynt's 7be5530b2 on his fork's reimpl/UI-MenuViews-development (44.69% in its status line, earlier 1f2ec771c and 3207aef99 at 39.2%): the whole function is his. Changed here: the 88 arms in the original's order, read off the addresses of the jump table's targets (1, 44, 2, 3, 4, 45, 5 .. 24, 96, 25, 53, 57, ..., 79, 78), which is the order MSVC lays the arms out in; quick_diff, which reduces every call to one token, cannot see this (it gives his order 0.9852) but reccmp does: 45.0% raw and 86.7% normalized in his order. Also: main's namespace form; decimals for the panel offsets (0x195, 0x196, 0x1b9, 0x1d7, 0x1d8, 0x1e9, 0xe); the casts on the colour and five unused using lines go; truth tests on the two BOOLEnum video flags; needsRedraw = TRUE; one comment. Left: the original has a separate arm for the mercenary post that calls 0x0043A8D0 like the barracks' arm (two arms, at 0x00449624 and 0x0044962E); ours calls the same resolver from both cases and MSVC merges the two arms into one. Two different functions folded into one address by the linker would explain the original's two arms; the header has one name for that address. With the arm missing, every jmp to the shared exit after it is 15 bytes off, which is all reccmp still shows. The tail call is the resolver's. This file was measured as it stands in a clean alone build of the branch on main eef6f667a: 72.9% raw, 58.9% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- ...iew_BuildingAndStatusMenu_DoEveryFrame.cpp | 348 ++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoEveryFrame.cpp diff --git a/src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoEveryFrame.cpp b/src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoEveryFrame.cpp new file mode 100644 index 0000000000..27da7e0cc3 --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/BuildingAndStatusMenu/MenuView_BuildingAndStatusMenu_DoEveryFrame.cpp @@ -0,0 +1,348 @@ +#include "../BuildingAndStatusMenu.func.hpp" + +#include "OpenSHC/UI/BuildingMenus.func.hpp" +#include "OpenSHC/UI/MinimapViewState.func.hpp" +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/UI/StatusMenus.func.hpp" +#include "OpenSHC/DE/SHCDE/eGM.hpp" +#include "OpenSHC/DE/SHCDE/eInBuildingModes.hpp" +#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" +#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" +#include "OpenSHC/UI/Enums/BuildingsAndStatusMenuTabType.hpp" + +#include "OpenSHC/Globals/COL_MAGENTA.hpp" +#include "OpenSHC/Globals/DAT_00b96108.hpp" +#include "OpenSHC/Globals/DAT_BuildingsState.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_MenuHandlerState.hpp" +#include "OpenSHC/Globals/DAT_MinimapViewState.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + namespace BuildingAndStatusMenu { + + // FUNCTION: STRONGHOLDCRUSADER 0x004494E0 + void MenuView_BuildingAndStatusMenu_DoEveryFrame() + { + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_640x480) { + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGM, DAT_TextureRenderCoreObject::ptr)( + OpenSHC::DE::SHCDE::GM_INTERFACE_PANELS, 3, 0, DAT_MenuHandlerState::instance.y + 472); + } else if (DAT_GameCore::instance.activeMenuTab.tabType + == OpenSHC::UI::Enums::BASMTT_BARRACKS_OR_MPMENU_MODEM) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, + DAT_PencilRenderCore::ptr)(DAT_MenuHandlerState::instance.x, + DAT_MenuHandlerState::instance.y + 405, DAT_MenuHandlerState::instance.x + 799, + DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGM, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::DE::SHCDE::GM_INTERFACE_PANELS, 4, + DAT_MenuHandlerState::instance.x, DAT_MenuHandlerState::instance.y + 405); + } else if (DAT_GameCore::instance.activeMenuTab.tabType == OpenSHC::UI::Enums::BASMTT_MERCENARYPOST) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, + DAT_PencilRenderCore::ptr)(DAT_MenuHandlerState::instance.x, + DAT_MenuHandlerState::instance.y + 405, DAT_MenuHandlerState::instance.x + 799, + DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGM, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::DE::SHCDE::GM_INTERFACE_PANELS, 6, + DAT_MenuHandlerState::instance.x, DAT_MenuHandlerState::instance.y + 405); + } else { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, + DAT_PencilRenderCore::ptr)(DAT_MenuHandlerState::instance.x, + DAT_MenuHandlerState::instance.y + 406, DAT_MenuHandlerState::instance.x + 799, + DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGM, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::DE::SHCDE::GM_INTERFACE_PANELS, 2, + DAT_MenuHandlerState::instance.x, DAT_MenuHandlerState::instance.y + 441); + } + if (DAT_00b96108::instance != 0) { + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, + DAT_TextureRenderCoreObject::ptr)( + 0, DAT_MenuHandlerState::instance.x + 14, DAT_MenuHandlerState::instance.y + 489); + } + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + switch (DAT_GameCore::instance.activeMenuTab.inBuildingTab) { + case OpenSHC::DE::SHCDE::IBM_INSIDE_BARRACKS: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_RecruitingBuilding)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_MERCPOST: + // the original keeps this arm apart from the barracks' one; MSVC merges the two here + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_RecruitingBuilding)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_KEEP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Keep)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_INN: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Inn)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_GRANARY: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Granary)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_OUTPOST: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Outpost)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_HOUSE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_House)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_WOODCUTTERS_HUT: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_WoodcutterShut)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_OXEN_BASE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_OxThether)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_IRON_MINE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Ironmine)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_PITCH_DIGGER: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_PitchRig)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_HUNTERS_HUT: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_HuntersHut)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_GOODS_YARD: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Stockpile)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_ARMOURY: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Armory)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_FLETCHERS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Fletcher)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BLACKSMITHS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Blacksmith)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_POLETURNERS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Poleturner)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_ARMOURERS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Armourer)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TANNERS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Tanner)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BAKERS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Bakery)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BREWERS_WORKSHOP: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Brewery)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_QUARRY: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Quarry)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_QUARRYPILE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Quarry_Stonepile)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_HEALERS: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Apothecary)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_ENGINEERS_GUILD: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Engineersguild)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TUNNELLERS_GUILD: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Tunnelersguild)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CATHEDRAL: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Cathedral)(); + case OpenSHC::DE::SHCDE::IBM_INSIDE_TRADEPOST: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Marketplace)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TRADEPOST_PRICES: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Marketplace_Stonks)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TRADEPOST_DO_THE_TRADE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Marketplace_Trade)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TRADEPOST_FOOD: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Marketplace_Food)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TRADEPOST_BULK: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Marketplace_Resource)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TRADEPOST_ARMS: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Marketplace_Weapons)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_WELL: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Well)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_WATERPOT: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_WaterPot)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_OIL_SMELTER: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Oilsmelter)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_WHEATFARM: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Wheatfarm)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_HOPSFARM: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Hopfarm)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_APPLEFARM: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Applefarm)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CATTLEFARM: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Diaryfarm)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_MILL: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Mill)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_STABLES: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Stables)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CHURCH: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_ChapelAndChurch)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_GATEHOUSE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Gatehouse)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_DRAWBRIDGE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Drawbridge)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_POSTERN_GATE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Unused_PosternGate)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TUNNEL_ENTERANCE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_TunnelEntrance)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_SIGNPOST: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Signpost)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_KILLING_PIT: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_KillingPit)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CAMPGROUND: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Campfire)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TOWER: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Tower)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_GALLOWS: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Gallows)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_STOCKS: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Stocks)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_WITCH_HOIST: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Unused_Witchhoist)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_MAYPOLE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Maypole)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_GARDEN: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Gardens)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_PARADEGROUND: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_TrainingGrounds)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CATAPULT: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Siegetent_Catapult)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_ARAB_BALLISTA: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Siegetent_Fireballista)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_TREBUCHET: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Siegetent_Trebuchet)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_SIEGE_TOWER: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Siegetent_Siegetower)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BATTERING_RAM: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Siegetent_BatteringRam)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_PORTABLE_SHIELD: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Siegetent_Shield)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CESS_PIT: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_CessPit)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BURNING_STAKE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_BurningStake)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_GIBBET: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Gibbet)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_DUNGEON: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Dungeon)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_STRETCHING_RACK: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_StretchingRack)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_FLOGGING_RACK: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Unused_FloggingRack)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CHOPPING_BLOCK: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_ChoppingBlock)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_DUNKING_STOOL: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_DunkingStool)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_DOG_CAGE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_DogCage)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_STATUE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Statue)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_SHRINE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Shrine)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BEEHIVE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Unused_BeeHive)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_DANCING_BEAR: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_DancingBear)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_POND: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Unused_Pond)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_BEAR_CAVE: + MACRO_CALL(OpenSHC::UI::BuildingMenus_Func::RenderBuildingMenu_Unused_BearCave)(); + break; + case OpenSHC::DE::SHCDE::IBM_INSIDE_CHIMP: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Chimp)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Overview)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_POPULARITY: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Popularity)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_FEARFACTOR: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_FearFactor)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_POPULATION: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Population)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_FOOD: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Food)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_ARMY: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Army)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_STORES: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Resources)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_RELIGION: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Religion)(); + break; + case OpenSHC::DE::SHCDE::IBM_SUB_MODE_REPORTS_WEAPONS: + MACRO_CALL(OpenSHC::UI::StatusMenus_Func::RenderStatusMenu_Weapons)(); + break; + } + DAT_WindowAndDirectDraw::instance.unk_resetViewportRelated = 2; + if (!DAT_GameCore::instance.isBinkVideoPlaying + && !DAT_BuildingsState::instance.DAT_IsBuildingOrPeasantBinkPlaying + && DAT_WindowAndDirectDraw::instance.currentGameResolution != OpenSHC::Rendering::SRE_640x480) { + DAT_MinimapViewState::instance.needsRedraw = TRUE; + MACRO_CALL_MEMBER( + OpenSHC::UI::MinimapViewState_Func::renderMinimapMain, DAT_MinimapViewState::ptr)(); + } + } + + } + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 6da3db0bd8..9ba8e26082 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -16407,7 +16407,7 @@ SHC_3BB0A8C1_0x00449400 | 0.0% | Pending SHC_3BB0A8C1_0x00449410 | 0.0% | Pending -SHC_3BB0A8C1_0x004494E0 | 0.0% | Pending +SHC_3BB0A8C1_0x004494E0 | 72.9% | gynt's draft in the original's arm order; the original keeps the mercenary post's arm apart from the barracks' one SHC_3BB0A8C1_0x00449994 | 0.0% | Pending From 361895e35315a1a2857f98216595379ffe38c129 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 23:39:24 +0100 Subject: [PATCH 08/11] reimplement: SHC_3BB0A8C1_0x004306D0 91.4% own rewrite from the asm with gynt's draft Draft. MenuView_UnusedCreateSiege_DoEveryFrame draws the unused "'Siege That' Builder" screen: the title, " - " and the map's name, the description (TEXT_MAPEDIT 37) unless the bottom-left text box shows one, and the same minimap preview with its size label as NewMapMapsize's DoEveryFrame (0x0042F3F0, here at y + 240); then it clears MenuTextInputState.field_0xa4 and stores whether the current player has a keep. Written from the original's instructions, with gynt's draft (266501cf6 on his fork's reimpl/UI-MenuViews-development, 73.70% there; earlier 0df26b801, c218ebdb5, 94b5738ac and 660d9d625) for the reads; the preview is the code of the twins in sourcehold/OpenSHC#369, which the original's instructions repeat. Changed: main's names after the sync (field_0x24, field_0xa4, buildingEntryInfos[0] for keep); the description's position as two locals, y first (inline: quick_diff 0.8802 -> 0.5928); s___005a2304 for " - "; COL_C2F0EB and COL_000000; decimals; main's namespace form; no decompiler locals. Left: the original keeps 1 in ebx and saves all four callee-saved registers up front, and in the name's else branch computes the position into esi and edi before it calls getTextArrayPointer; ours keeps 1 in edi and saves ebx and esi only around the preview. The forms tried for the name (its position as locals before the branch or in it, the call as a statement of its own, the title's position as locals) all lose. This file was measured as it stands in a clean alone build of the branch on main eef6f667a: 91.4% raw, 76.4% normalized. Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- ...enuView_UnusedCreateSiege_DoEveryFrame.cpp | 216 ++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 217 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp diff --git a/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp b/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp new file mode 100644 index 0000000000..91b6ddf0e1 --- /dev/null +++ b/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp @@ -0,0 +1,216 @@ +#include "../UnusedCreateSiege.func.hpp" + +#include "OpenSHC/OS.func.hpp" +#include "OpenSHC/Text/TextManager.func.hpp" +#include "OpenSHC/Text/UserTextHandler.func.hpp" +#include "OpenSHC/UI/MinimapViewState.func.hpp" +#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Map/MapType2.hpp" +#include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" +#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" +#include "OpenSHC/Text/TextAlignment.hpp" +#include "OpenSHC/UI/Enums/MenuModalType.hpp" +#include "OpenSHC/string-literals.hpp" + +#include "OpenSHC/Globals/COL_BLACK.hpp" +#include "OpenSHC/Globals/DAT_BottomLeftTextDisplayState.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp" +#include "OpenSHC/Globals/DAT_MapPropertiesState.hpp" +#include "OpenSHC/Globals/DAT_MenuHandlerState.hpp" +#include "OpenSHC/Globals/DAT_MenuModalComposition1.hpp" +#include "OpenSHC/Globals/DAT_MenuTextInputState.hpp" +#include "OpenSHC/Globals/DAT_MinimapViewState.hpp" +#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" +#include "OpenSHC/Globals/DAT_TextManagerObject.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_TileMapState.hpp" +#include "OpenSHC/Globals/DAT_UserTextHandlerState.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" +#include "OpenSHC/Globals/INT_00b95f68.hpp" +#include "OpenSHC/Globals/INT_00b960e4.hpp" +#include "OpenSHC/Globals/INT_00b960ec.hpp" + +namespace OpenSHC { +namespace UI { + namespace MenuViews { + namespace UnusedCreateSiege { + + // FUNCTION: STRONGHOLDCRUSADER 0x004306D0 + void MenuView_UnusedCreateSiege_DoEveryFrame() + { + DAT_MapPropertiesState::instance.SEC_U3_MapType2_1 = OpenSHC::Map::MT_SIEGE; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::drawGfxOnFlaggedSurface, + DAT_TextureRenderCoreObject::ptr)(0, + (DAT_WindowAndDirectDraw::instance.resolutionX + - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].width) + / 2, + (DAT_WindowAndDirectDraw::instance.resolutionY + - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height) + / 2); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawHeaderBanner, DAT_PencilRenderCore::ptr)( + DAT_MenuHandlerState::instance.x + 48, DAT_MenuHandlerState::instance.y + 6, 704, 50); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + if (!DAT_BottomLeftTextDisplayState::instance.currentlyDisplayedTextIsDisplayedUnk) { + // "Use the pre-built map and fixed amounts of stone and gold to build the strongest castle ..." + DAT_TextManagerObject::instance.field_0x24 = 1; + // its position named, y first (inline: quick_diff 0.8802 -> 0.5928) + int const textY = DAT_MenuHandlerState::instance.y + 118; + int const textX = DAT_MenuHandlerState::instance.x + 18; + MACRO_CALL_MEMBER( + OpenSHC::Text::TextManager_Func::renderMultilineText6Unk, DAT_TextManagerObject::ptr)( + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::getTextStringInGroupAtOffset, + DAT_TextManagerObject::ptr)(OpenSHC::DE::SHCDE::TEXT_MAPEDIT, 37), + textX, textY, 456, 0xccfaff, OpenSHC::Rendering::Colors::COL_000000, 17, 0); + } + // "'Siege That' Builder - " and the map's name + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderTextToScreen, DAT_TextManagerObject::ptr)( + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::getTextStringInGroupAtOffset, + DAT_TextManagerObject::ptr)(OpenSHC::DE::SHCDE::TEXT_MAPEDIT, 34), + DAT_MenuHandlerState::instance.x + 140, DAT_MenuHandlerState::instance.y + 35, + OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_C2F0EB, 17, FALSE, 0); + // " - " + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderTextToScreen, DAT_TextManagerObject::ptr)( + s___005a2304, DAT_MenuHandlerState::instance.x + 140, DAT_MenuHandlerState::instance.y + 35, + OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_C2F0EB, 17, TRUE, 0); + if (INT_00b960e4::instance == 0) { + // "Untitled" + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderTextToScreen, DAT_TextManagerObject::ptr)( + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::getTextStringInGroupAtOffset, + DAT_TextManagerObject::ptr)(OpenSHC::DE::SHCDE::TEXT_MAPEDIT, 24), + DAT_MenuHandlerState::instance.x + 140, DAT_MenuHandlerState::instance.y + 35, + OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_C2F0EB, 17, TRUE, 0); + } else { + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderTextToScreen, DAT_TextManagerObject::ptr)( + MACRO_CALL_MEMBER( + OpenSHC::Text::UserTextHandler_Func::getTextArrayPointer, DAT_UserTextHandlerState::ptr)(2), + DAT_MenuHandlerState::instance.x + 140, DAT_MenuHandlerState::instance.y + 35, + OpenSHC::Text::TTA_LEFT, OpenSHC::Rendering::Colors::COL_C2F0EB, 17, TRUE, 0); + } + + if (DAT_MenuModalComposition1::instance.activeModalDialogID == OpenSHC::UI::Enums::MMT_NONE) { + // the minimap preview, centred on (x, y) + int x = DAT_MenuHandlerState::instance.x + 600; + int y = DAT_MenuHandlerState::instance.y + 240; + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue + = OpenSHC::Rendering::Enums::RT_MAP_GAME; + int mapSize = DAT_TileMapState::instance.mapSize; + if (mapSize == 0) { + mapSize = 400; + } + int const centerX = x; + int const centerY = y; + DAT_MinimapViewState::instance.needsRedraw = TRUE; + char sizeText[20]; + // "%dx%d" + MACRO_CALL(OpenSHC::OS_Func::_sprintf)(sizeText, s__dx_d_005a22fc, mapSize, mapSize); + // x and y move to the preview's top left corner + int previewSize; + switch (mapSize) { + case 100: + x -= 50; + y -= 50; + MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, + DAT_MinimapViewState::ptr)(x, y, mapSize, mapSize); + previewSize = 100; + break; + case 160: + x -= 80; + y -= 80; + MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, + DAT_MinimapViewState::ptr)(x, y, mapSize, mapSize); + previewSize = 160; + break; + case 200: + x -= 100; + y -= 100; + MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, + DAT_MinimapViewState::ptr)(x, y, mapSize, mapSize); + previewSize = 200; + break; + case 300: + // drawn at half size + x -= 75; + y -= 75; + MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, + DAT_MinimapViewState::ptr)(x, y, 150, 150); + previewSize = 150; + break; + default: + // 400 is drawn at half size + x -= 100; + y -= 100; + MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, + DAT_MinimapViewState::ptr)(x, y, 200, 200); + previewSize = 200; + break; + } + + // a two-pixel black frame around the preview + // default first, as the original lays the arms out; a 100 map gets the default 200 frame + switch (mapSize) { + default: + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 100, centerY - 100, centerX + 99, centerY + 100, COL_BLACK::instance.shortValue); + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 101, centerY - 101, centerX + 100, centerY + 101, COL_BLACK::instance.shortValue); + break; + case 300: + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 75, centerY - 75, centerX + 73, centerY + 74, COL_BLACK::instance.shortValue); + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 76, centerY - 76, centerX + 74, centerY + 75, COL_BLACK::instance.shortValue); + break; + case 200: + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 98, centerY - 99, centerX + 99, centerY + 99, COL_BLACK::instance.shortValue); + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 99, centerY - 100, centerX + 100, centerY + 100, COL_BLACK::instance.shortValue); + break; + case 160: + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 78, centerY - 79, centerX + 78, centerY + 77, COL_BLACK::instance.shortValue); + MACRO_CALL_MEMBER( + OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( + centerX - 79, centerY - 80, centerX + 79, centerY + 78, COL_BLACK::instance.shortValue); + break; + } + + // the size label at the top right (x += previewSize: quick_diff 0.9760 -> 0.8617) + int const labelX = x + previewSize; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::PencilRenderCore_Func::dimBox, DAT_PencilRenderCore::ptr)( + labelX + - MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::computeTextWidth, + DAT_TextManagerObject::ptr)(sizeText, 19) + - 15, + y - 15, labelX, y); + MACRO_CALL_MEMBER(OpenSHC::Text::TextManager_Func::renderInGameTextWithShadow, + DAT_TextManagerObject::ptr)(sizeText, labelX - 5, y - 11, OpenSHC::Text::TTA_RIGHT, + OpenSHC::Rendering::Colors::COL_C2F0EB, OpenSHC::Rendering::Colors::COL_000000, 19, FALSE, 0); + } + if (DAT_MenuTextInputState::instance.field_0xa4 != 0) { + INT_00b95f68::instance = 0; + DAT_MenuTextInputState::instance.field_0xa4 = 0; + } + INT_00b960ec::instance + = DAT_GameState::instance.playerDataArray[DAT_GameSynchronyState::instance.currentPlayerSlotID] + .buildingEntryInfos[0] + .id + != 0; + } + + } + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 9ba8e26082..b21c544d19 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -10117,7 +10117,7 @@ SHC_3BB0A8C1_0x00430686 | 0.0% | Pending SHC_3BB0A8C1_0x00430690 | 0.0% | Pending -SHC_3BB0A8C1_0x004306D0 | 0.0% | Pending +SHC_3BB0A8C1_0x004306D0 | 91.4% | own rewrite from the asm with gynt's draft; the constant 1's register and the name branch's register use SHC_3BB0A8C1_0x00430B10 | 0.0% | Pending From 0a0338274aa098aa58b1e347b1aab96a14ed4171 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 23:42:10 +0100 Subject: [PATCH 09/11] style: UnusedCreateSiege's map sizes by their MapConstants names As in #369's twins: 160, 200, 300 and the default 400 are MC_MAP_SIZE_160, _200, _300 and _400; 100 has no name and stays a number. quick_diff 0.8802 as before. Co-Authored-By: Claude Opus 5.5 --- .../MenuView_UnusedCreateSiege_DoEveryFrame.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp b/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp index 91b6ddf0e1..8f11b23170 100644 --- a/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp +++ b/src/OpenSHC/UI/MenuViews/UnusedCreateSiege/MenuView_UnusedCreateSiege_DoEveryFrame.cpp @@ -7,6 +7,7 @@ #include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" #include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" #include "OpenSHC/DE/SHCDE/eTextSections.hpp" +#include "OpenSHC/Map/MapConstants.hpp" #include "OpenSHC/Map/MapType2.hpp" #include "OpenSHC/Rendering/Colors/ColorsEnum.hpp" #include "OpenSHC/Rendering/Enums/RenderTarget.hpp" @@ -100,7 +101,7 @@ namespace UI { = OpenSHC::Rendering::Enums::RT_MAP_GAME; int mapSize = DAT_TileMapState::instance.mapSize; if (mapSize == 0) { - mapSize = 400; + mapSize = OpenSHC::Map::MC_MAP_SIZE_400; } int const centerX = x; int const centerY = y; @@ -118,21 +119,21 @@ namespace UI { DAT_MinimapViewState::ptr)(x, y, mapSize, mapSize); previewSize = 100; break; - case 160: + case OpenSHC::Map::MC_MAP_SIZE_160: x -= 80; y -= 80; MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, DAT_MinimapViewState::ptr)(x, y, mapSize, mapSize); previewSize = 160; break; - case 200: + case OpenSHC::Map::MC_MAP_SIZE_200: x -= 100; y -= 100; MACRO_CALL_MEMBER(OpenSHC::UI::MinimapViewState_Func::renderMinimapEditor, DAT_MinimapViewState::ptr)(x, y, mapSize, mapSize); previewSize = 200; break; - case 300: + case OpenSHC::Map::MC_MAP_SIZE_300: // drawn at half size x -= 75; y -= 75; @@ -161,7 +162,7 @@ namespace UI { OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( centerX - 101, centerY - 101, centerX + 100, centerY + 101, COL_BLACK::instance.shortValue); break; - case 300: + case OpenSHC::Map::MC_MAP_SIZE_300: MACRO_CALL_MEMBER( OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( centerX - 75, centerY - 75, centerX + 73, centerY + 74, COL_BLACK::instance.shortValue); @@ -169,7 +170,7 @@ namespace UI { OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( centerX - 76, centerY - 76, centerX + 74, centerY + 75, COL_BLACK::instance.shortValue); break; - case 200: + case OpenSHC::Map::MC_MAP_SIZE_200: MACRO_CALL_MEMBER( OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( centerX - 98, centerY - 99, centerX + 99, centerY + 99, COL_BLACK::instance.shortValue); @@ -177,7 +178,7 @@ namespace UI { OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( centerX - 99, centerY - 100, centerX + 100, centerY + 100, COL_BLACK::instance.shortValue); break; - case 160: + case OpenSHC::Map::MC_MAP_SIZE_160: MACRO_CALL_MEMBER( OpenSHC::UI::Rendering::PencilRenderCore_Func::drawBorderBox, DAT_PencilRenderCore::ptr)( centerX - 78, centerY - 79, centerX + 78, centerY + 77, COL_BLACK::instance.shortValue); From f08cf0b300cfecb4604c011dfe1d5b5933fe8994 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Mon, 9 Nov 2026 00:40:53 +0100 Subject: [PATCH 10/11] reimplement: SHC_3BB0A8C1_0x00426600 97.7% x in its own local Draft. MenuView_UnusedDemoBuyItScreen_DoInitial (0d11bd29a, gynt's draft in main's style) now gives x a local of its own, x = borderWidth with + 24 at 800x600, instead of adding to borderWidth in place. That puts the height in eax and the width in ecx, as in the original (with one local for both, ours held them the other way round); the y store into MenuHandlerState now comes before the x store, also as in the original (quick_diff 0.8605 -> 0.9535; one local for both: 0.8605). Left: our menu y store is placed before the resolution test, the original's after it; writing the store into both arms of the test, or the test before the store, loses. Measured in a build of the changed draft files alone on the branch (main e32319b21): 97.7% raw, 94.4% normalized (was 83.7% and 66.7%). Co-authored-by: Gynt Co-Authored-By: Claude Opus 5.5 --- .../MenuView_UnusedDemoBuyItScreen_DoInitial.cpp | 11 ++++++----- status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp b/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp index 5f295b78a1..2066a01f37 100644 --- a/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp +++ b/src/OpenSHC/UI/MenuViews/UnusedDemoBuyItScreen/MenuView_UnusedDemoBuyItScreen_DoInitial.cpp @@ -38,16 +38,17 @@ namespace UI { - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height) / 2); int const borderHeight = DAT_WindowAndDirectDraw::instance.mainMenuBorderHeight; - int borderWidth = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; + int const borderWidth = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; menu->yPosition = borderHeight; + // x apart from borderWidth puts the height in eax (one local for both: quick_diff 0.9535 -> 0.8605) + int x = borderWidth; if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_800x600) { - borderWidth += 24; + x = borderWidth + 24; } - menu->xPosition = borderWidth; - // x before y (y before x: quick_diff 0.8605 -> 0.8372); the original holds the height in eax, ours in ecx - DAT_MenuHandlerState::instance.x = borderWidth; + menu->xPosition = x; DAT_MenuHandlerState::instance.y = borderHeight; + DAT_MenuHandlerState::instance.x = x; } } diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 143d1a826c..f1ef8995e5 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -6767,7 +6767,7 @@ SHC_3BB0A8C1_0x00426340 | 0.0% | Pending SHC_3BB0A8C1_0x00426570 | 0.0% | Pending -SHC_3BB0A8C1_0x00426600 | 83.7% | style pass, x before y; height and width in swapped registers +SHC_3BB0A8C1_0x00426600 | 97.7% | x in its own local; the menu y store placed before the resolution test SHC_3BB0A8C1_0x004266A0 | 100.0% | Reimplemented From 2680bdad4e1e8700fc059745d3be59224fdde235 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Mon, 9 Nov 2026 20:08:32 +0100 Subject: [PATCH 11/11] drafts: drop MenuView_BuildMenu_DoInitial, which reimpl/UI-A-round37-100 has at 100% MenuView_BuildMenu_DoInitial (0x00431B60) is at 100% on reimpl/UI-A-round37-100. Its draft here (99.9%, from 3717c673a) goes, and its status line returns to main's, so the two PRs merge cleanly in either order. Co-Authored-By: Claude Opus 5.5 --- .../MenuView_BuildMenu_DoInitial.cpp | 1017 ----------------- status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 1 insertion(+), 1018 deletions(-) delete mode 100644 src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp diff --git a/src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp b/src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp deleted file mode 100644 index ffa7b3b3e1..0000000000 --- a/src/OpenSHC/UI/MenuViews/BuildMenu/MenuView_BuildMenu_DoInitial.cpp +++ /dev/null @@ -1,1017 +0,0 @@ -#include "../BuildMenu.func.hpp" - -#include "OpenSHC/UI/Rendering/PencilRenderCore.func.hpp" -#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" -#include "OpenSHC/Game/GameMode2.hpp" -#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" -#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" -#include "OpenSHC/UI/Enums/BuildMenuTabType.hpp" -#include "OpenSHC/string-literals.hpp" - -#include "OpenSHC/Globals/COL_MAGENTA.hpp" -#include "OpenSHC/Globals/DAT_GameCore.hpp" -#include "OpenSHC/Globals/DAT_MenuHandlerState.hpp" -#include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" -#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" -#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" - -namespace OpenSHC { -namespace UI { - namespace MenuViews { - - // FUNCTION: STRONGHOLDCRUSADER 0x00431B60 - void BuildMenu::MenuView_BuildMenu_DoInitial() - { - // the build menu sits at the bottom of the screen, at its left edge at 640x480 - int const y = DAT_WindowAndDirectDraw::instance.resolutionY - 600; - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_640x480) { - Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; - menu->xPosition = 0; - menu->yPosition = y; - DAT_MenuHandlerState::instance.x = 0; - } else { - int const x = DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth; - Menu* const menu = DAT_MenuHandlerState::instance.currentMenu; - menu->xPosition = x; - menu->yPosition = y; - DAT_MenuHandlerState::instance.x = x; - } - DAT_MenuHandlerState::instance.y = y; - // the soldiers tab has its own menu picture and edge pictures - if (DAT_GameCore::instance.activeMenuTab.buildMenuTab == OpenSHC::UI::Enums::BMTT_SOLDIERS) { - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, - DAT_TextureRenderCoreObject::ptr)(8); - } else { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, - DAT_TextureRenderCoreObject::ptr)(4); - } - if (DAT_WindowAndDirectDraw::instance.pendingMenuRedraw == 0) { - return; - } - MACRO_CALL_MEMBER( - OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, DAT_PencilRenderCore::ptr)(0, - DAT_MenuHandlerState::instance.y + 406, DAT_WindowAndDirectDraw::instance.resolutionX - 1, - DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); - DAT_WindowAndDirectDraw::instance.pendingMenuRedraw = 0; - // the edge pictures left and right of the menu, for this resolution - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - // "edge_military_1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); - } else { - // "edge_military_1024r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024r_tgx_005a25a8); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 896, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - } else { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 912, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - // "edge_military_1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024l_tgx_005a25c0); - } else { - // "edge_military_1024r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1024r_tgx_005a25a8); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 896, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - } else { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 912, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); - } else { - // "edge_military_1280r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280r_tgx_005a2578); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1040, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); - } else { - // "edge_military_1600r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600r_tgx_005a2548); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1200, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280l_tgx_005a2590); - } else { - // "edge_military_1280r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1280r_tgx_005a2578); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1040, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1440l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1440l_tgx_005a2530); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1440l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1440l_tgx_005a2530); - } else { - // "edge_military_1440r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1440r_tgx_005a2518); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1120, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); - } else { - // "edge_military_1920r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920r_tgx_005a24e8); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1360, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920l_tgx_005a2500); - } else { - // "edge_military_1920r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1920r_tgx_005a24e8); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1360, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); - } else { - // "edge_military_2560r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560r_tgx_005a24b8); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1680, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560l_tgx_005a24d0); - } else { - // "edge_military_2560r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_2560r_tgx_005a24b8); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1680, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1366l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1366l_tgx_005a24a0); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1366l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1366l_tgx_005a24a0); - } else { - // "edge_military_1366r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1366r_tgx_005a2488); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1082, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1360l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1360l_tgx_005a2470); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1360l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1360l_tgx_005a2470); - } else { - // "edge_military_1360r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1360r_tgx_005a2458); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1080, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1680l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1680l_tgx_005a2440); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1680l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1680l_tgx_005a2440); - } else { - // "edge_military_1680r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1680r_tgx_005a2428); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1240, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge_military_1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600l_tgx_005a2560); - } else { - // "edge_military_1600r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge_military_1600r_tgx_005a2548); - } - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1200, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - } else { - // no picture for a hidden menu or tab 62 (BuildMenuTabType has no name for it) - if (DAT_GameCore::instance.activeMenuTab.buildMenuTab == OpenSHC::UI::Enums::BMTT_MENU_HIDDEN) { - return; - } - if (DAT_GameCore::instance.activeMenuTab.buildMenuTab == 62) { - return; - } - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, - DAT_TextureRenderCoreObject::ptr)(9); - } else if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR) { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, - DAT_TextureRenderCoreObject::ptr)(5); - } else { - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::setMenuTabIndexUnk, - DAT_TextureRenderCoreObject::ptr)(0); - } - if (DAT_WindowAndDirectDraw::instance.pendingMenuRedraw == 0) { - return; - } - MACRO_CALL_MEMBER( - OpenSHC::UI::Rendering::PencilRenderCore_Func::drawColorBox, DAT_PencilRenderCore::ptr)(0, - DAT_MenuHandlerState::instance.y + 406, DAT_WindowAndDirectDraw::instance.resolutionX - 1, - DAT_MenuHandlerState::instance.y + 471, COL_MAGENTA::instance.shortValue); - DAT_WindowAndDirectDraw::instance.pendingMenuRedraw = 0; - // the edge pictures left and right of the menu, for this resolution: the editor and siege games - // show the left one on both sides - if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_EDITOR - || DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_SIEGE_THAT) { - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); - // "edge1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 912, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); - // "edge1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 912, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); - // "edge1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1040, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); - // "edge1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1200, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); - // "edge1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1040, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1440l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1440l_tgx_005a2358); - // "edge1440l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1440l_tgx_005a2358); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1120, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); - // "edge1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1360, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); - // "edge1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1360, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); - // "edge2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1680, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); - // "edge2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1680, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1366l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1366l_tgx_005a2328); - // "edge1366l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1366l_tgx_005a2328); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1082, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1360l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1360l_tgx_005a2318); - // "edge1360l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1360l_tgx_005a2318); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1080, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1680l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1680l_tgx_005a2308); - // "edge1680l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1680l_tgx_005a2308); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1240, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); - // "edge1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1200, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - } else { - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); - // "edge1024r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024r_tgx_005a2418); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 912, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x600) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1024l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024l_tgx_005a2388); - // "edge1024r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1024r_tgx_005a2418); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 912, 600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); - // "edge1280r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280r_tgx_005a2408); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1040, 1024 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); - // "edge1600r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600r_tgx_005a23f8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1200, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1280l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280l_tgx_005a2378); - // "edge1280r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1280r_tgx_005a2408); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1040, 720 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1440l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1440l_tgx_005a2358); - // "edge1440r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1440r_tgx_005a23e8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1120, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); - // "edge1920r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920r_tgx_005a23d8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1360, 1080 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1920l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920l_tgx_005a2348); - // "edge1920r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1920r_tgx_005a23d8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1360, 1200 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); - // "edge2560r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560r_tgx_005a23c8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1680, 1440 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge2560l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560l_tgx_005a2338); - // "edge2560r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge2560r_tgx_005a23c8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1680, 1600 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1366l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1366l_tgx_005a2328); - // "edge1366r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1366r_tgx_005a23b8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1082, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1360l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1360l_tgx_005a2318); - // "edge1360r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1360r_tgx_005a23a8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1080, 768 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1680l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1680l_tgx_005a2308); - // "edge1680r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1680r_tgx_005a2398); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1240, 1050 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { - DAT_TextureRenderCoreObject::instance.totalLoadedGfx = 0; - // "edge1600l.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600l_tgx_005a2368); - // "edge1600r.tgx" - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::loadGfxFile, - DAT_TextureRenderCoreObject::ptr)(s_edge1600r_tgx_005a23f8); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 0, 0, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[0].height); - MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderLoadedGfx, - DAT_TextureRenderCoreObject::ptr)( - 1, 1200, 900 - DAT_TextureRenderCoreObject::instance.loadedGfxArray[1].height); - DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue - = OpenSHC::Rendering::Enums::RT_MAP_GAME; - } - } - } - } - - } -} -} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 32b33ddda4..54e924b42d 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -11079,7 +11079,7 @@ SHC_3BB0A8C1_0x00431990 | 0.0% | Pending SHC_3BB0A8C1_0x00431A90 | 0.0% | Pending -SHC_3BB0A8C1_0x00431B60 | 99.9% | the 640x480 y store restored, s_ pointers, style pass; one add/xor order +SHC_3BB0A8C1_0x00431B60 | 0.0% | Pending SHC_3BB0A8C1_0x00433030 | 0.0% | Pending