Reimpl/simple functions set 1

cmake/compiler-flags-gl.txt

@@ -7,3 +7,11 @@ src/OpenSHC/IO/ResourceManager/swapMapDataWithNextMap.cpp
 src/OpenSHC/UI/Rendering/WindowAndDirectDraw/takeScreenshot.cpp
 src/OpenSHC/IO/ResourceManager/readFirstPartOfCurrentResourceIntoMemory.cpp
 src/OpenSHC/IO/ResourceManager/readNextPartOfCurrentResourceIntoMemory.cpp
+src/OpenSHC/Map/TileMapState/updateMoatCountdownTimers.cpp
+src/OpenSHC/Map/TileMapState/recountTotalOwnedMoats.cpp
+src/OpenSHC/Game/GameStateStructures/getSalesPrice.cpp
+src/OpenSHC/Map/TileMapState/updateBuildingPlacementRotationPreview.cpp
+src/OpenSHC/Map/Units/TribesState/playUnitSelectSpeech.cpp
+src/OpenSHC/Audio/SFX/SFXState/playUnitSpeech.cpp
+src/OpenSHC/Game/GameStateStructures/getSellResourceAmount.cpp
+src/OpenSHC/Map/TileMapState/determineBuildingPlacementRotation.cpp

src/OpenSHC/Game/GameCore/exitToScenarioDescriptionMenu.cpp

@@ -0,0 +1,21 @@
+#include "OpenSHC/Game/GameCore.func.hpp"
+#include "OpenSHC/UI/Enums/MenuViewType.hpp"
+
+#include "OpenSHC/Globals/DAT_GameCore.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::UI::Enums::MenuViewType;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00471A80
+    void GameCore::exitToScenarioDescriptionMenu()
+    {
+        MACRO_CALL_MEMBER(OpenSHC::Game::GameCore_Func::removeLadyAndJester, this)();
+        DAT_GameCore::instance.field22_0x64 = 0;
+        MACRO_CALL_MEMBER(OpenSHC::Game::GameCore_Func::switchToMenuView, DAT_GameCore::ptr)(
+            OpenSHC::UI::Enums::MVT_SCENARIO_DESCRIPTION, 0);
+    }
+
+}
+}

src/OpenSHC/Game/GameCore/isGameHaltingMenuOpen.cpp

@@ -0,0 +1,31 @@
+#include "OpenSHC/Game/GameCore.func.hpp"
+#include "OpenSHC/Game/GameMode.hpp"
+#include "OpenSHC/UI/Enums/MenuModalType.hpp"
+#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"
+
+#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"
+#include "OpenSHC/Globals/DAT_MenuModalComposition1.hpp"
+#include "OpenSHC/Globals/DAT_MenuTextInputState.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::Game::GameMode;
+    using OpenSHC::UI::Enums::MenuModalType;
+    using OpenSHC::WindowsHelper::Enums::BOOLEnum;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046BD20
+    BOOLEnum GameCore::isGameHaltingMenuOpen()
+    {
+        if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY
+            && DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SKIRMISH_SINGLE_PLAYER) {
+            return FALSE;
+        }
+        if (DAT_MenuTextInputState::instance.currentModalDialog != OpenSHC::UI::Enums::MMT_NO_MENU) {
+            return TRUE;
+        }
+        return DAT_MenuModalComposition1::instance.activeModalDialogID == OpenSHC::UI::Enums::MMT_IN_GAME_HELP_TEXT;
+    }
+
+}
+}

src/OpenSHC/Game/GameCore/setTabToSwitchTo.cpp

@@ -0,0 +1,21 @@
+#include "OpenSHC/Game/GameCore.func.hpp"
+#include "OpenSHC/UI/Enums/MenuViewType.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::UI::Enums::MenuViewType;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046B300
+    void GameCore::setTabToSwitchTo()
+    {
+        if (this->currentMenuViewType == OpenSHC::UI::Enums::MVT_BUILD_MENU) {
+            this->secondaryActiveMenuTabToSwitchTo = this->buildmenuMenuTabToSwitchTo;
+        }
+        if (this->currentMenuViewType == OpenSHC::UI::Enums::MVT_MAP_EDITOR_LANDSCAPING) {
+            this->secondaryActiveMenuTabToSwitchTo.tabType = this->landscapingmenuMenuTabToSwitchTo;
+        }
+    }
+
+}
+}

src/OpenSHC/Game/GameCore/setViewOnExitUnk.cpp

@@ -0,0 +1,13 @@
+#include "OpenSHC/Game/GameCore.func.hpp"
+#include "OpenSHC/UI/Enums/MenuViewType.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::UI::Enums::MenuViewType;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046B2F0
+    void GameCore::setViewOnExitUnk() { this->currentMenuViewType = (MenuViewType)2; }
+
+}
+}

src/OpenSHC/Game/GameCore/swapBuildMenuTab.cpp

@@ -0,0 +1,20 @@
+#include "OpenSHC/Game/GameCore.func.hpp"
+#include "OpenSHC/UI/Enums/BuildingsAndStatusMenuTabType.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::UI::Enums::BuildingsAndStatusMenuTabType;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0046B320
+    void GameCore::swapBuildMenuTab()
+    {
+        if (this->buildmenuMenuTabToSwitchTo.tabType == OpenSHC::UI::Enums::BASMTT_SIEGETENT_SHIELD) {
+            this->buildmenuMenuTabToSwitchTo.tabType = OpenSHC::UI::Enums::BASMTT_SIEGETENT_BATTERINGRAM;
+            return;
+        }
+        this->buildmenuMenuTabToSwitchTo = this->secondaryActiveMenuTabToSwitchTo;
+    }
+
+}
+}

src/OpenSHC/Game/GameCore/switchToScenarioDescriptionMenuView.cpp

@@ -0,0 +1,21 @@
+#include "OpenSHC/Game/GameCore.func.hpp"
+#include "OpenSHC/UI/Enums/MenuViewType.hpp"
+
+#include "OpenSHC/Globals/DAT_GameCore.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::UI::Enums::MenuViewType;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x004719E0
+    void GameCore::switchToScenarioDescriptionMenuView()
+    {
+        MACRO_CALL_MEMBER(OpenSHC::Game::GameCore_Func::removeJesterAndLadyUnitsInCertainMissions, this)();
+        MACRO_CALL_MEMBER(OpenSHC::Game::GameCore_Func::switchToMenuView, DAT_GameCore::ptr)(
+            OpenSHC::UI::Enums::MVT_SCENARIO_DESCRIPTION, 0);
+        DAT_GameCore::instance.field22_0x64 = 0;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/activateTraderState.cpp

@@ -0,0 +1,14 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x004586D0
+    void GameStateStructures::activateTraderState()
+    {
+        this->mapAndTime.traderRelated2 = 2;
+        this->mapAndTime.traderRelatedCounter1 = 0;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/calculateTaxBribeExpenseForPlayer.cpp

@@ -0,0 +1,17 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00459140
+    int GameStateStructures::calculateTaxBribeExpenseForPlayer(int playerIndex, int taxStep, int currentPopulation)
+    {
+        int bribeExpense = ((5 - taxStep) * currentPopulation) / 2;
+        if (this->playerDataArray[playerIndex].currentResources[OpenSHC::Game::Resources::RT_GOLD] <= 0) {
+            bribeExpense = 0;
+        }
+        return bribeExpense;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/clearTribeHotKey.cpp

@@ -0,0 +1,20 @@
+#include "../GameStateStructures.func.hpp"
+
+#include "OpenSHC/Game/State/UnitSelectionHotKeyEntry.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::Game::State::UnitSelectionHotKeyEntry;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00459BB0
+    void GameStateStructures::clearTribeHotKey(int hotkeyID)
+    {
+        for (int i = 0; i < 2500; ++i) {
+            this->hotkeyTribes[hotkeyID].units[i].id = -1;
+            this->hotkeyTribes[hotkeyID].units[i].uid = -1;
+        }
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/destroyPlayerCompletely.cpp

@@ -0,0 +1,28 @@
+#include "../GameStateStructures.func.hpp"
+
+#include "OpenSHC/Map/Buildings/BuildingsState.func.hpp"
+#include "OpenSHC/Map/Entities/EntityState.func.hpp"
+#include "OpenSHC/Map/TileMapState.func.hpp"
+#include "OpenSHC/Map/Units/UnitsState.func.hpp"
+
+#include "OpenSHC/Globals/DAT_BuildingsState.hpp"
+#include "OpenSHC/Globals/DAT_EntityState.hpp"
+#include "OpenSHC/Globals/DAT_TileMapState.hpp"
+#include "OpenSHC/Globals/DAT_UnitsState.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00457B40
+    void GameStateStructures::destroyPlayerCompletely(int playerID)
+    {
+        MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::killUnits, DAT_UnitsState::ptr)(playerID);
+        MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::destroyBuildings, DAT_BuildingsState::ptr)(
+            playerID);
+        MACRO_CALL_MEMBER(OpenSHC::Map::TileMapState_Func::destroyWallsOfPlayer, DAT_TileMapState::ptr)(playerID);
+        MACRO_CALL_MEMBER(OpenSHC::Map::Entities::EntityState_Func::destroyEntitiesPart2, DAT_EntityState::ptr)(
+            playerID);
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/fillWith0xFF.cpp

@@ -0,0 +1,22 @@
+#include "../GameStateStructures.func.hpp"
+
+#include "OpenSHC/Game/GameStateStructures.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::Game::GameStateStructures;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00459BE0
+    void GameStateStructures::fillWith0xFF()
+    {
+        for (int hotkeyID = 0; hotkeyID < 10; ++hotkeyID) {
+            for (int i = 0; i < 2500; ++i) {
+                this->hotkeyTribes[hotkeyID].units[i].id = -1;
+                this->hotkeyTribes[hotkeyID].units[i].uid = -1;
+            }
+        }
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/findNextPlayerWithMarketplace.cpp

@@ -0,0 +1,22 @@
+#include "../GameStateStructures.func.hpp"
+
+#include "OpenSHC/Game/Player/PlayerData.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::Game::Player::PlayerData;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00458700
+    int GameStateStructures::findNextPlayerWithMarketplace(int playerID)
+    {
+        for (int nextPlayerID = playerID + 1; nextPlayerID < 9; ++nextPlayerID) {
+            if (this->playerDataArray[nextPlayerID].marketplace.id > 0) {
+                return nextPlayerID;
+            }
+        }
+        return 0;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/getBatchBuyPrice.cpp

@@ -0,0 +1,13 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00458890
+    int GameStateStructures::getBatchBuyPrice(undefined4 playerID, int resourceType)
+    {
+        return this->mapAndTime.buyAndSalesPriceArray[resourceType].buyPrice;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/getBuyPriceForOneUnit.cpp

@@ -0,0 +1,13 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x004588D0
+    int GameStateStructures::getBuyPriceForOneUnit(int resourceType)
+    {
+        return this->mapAndTime.buyAndSalesPriceArray[resourceType].buyPrice / 5;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/getNumberToDisplayBribeIncome.cpp

@@ -0,0 +1,19 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x004591B0
+    int GameStateStructures::getNumberToDisplayBribeIncome(int playerIndex, int taxStep, int currentPopulation)
+    {
+        int bribeIncome = 0;
+        if (taxStep < 3) {
+            bribeIncome = MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::calculateTaxBribeExpenseForPlayer,
+                              this)(playerIndex, taxStep, currentPopulation)
+                * 4;
+        }
+        return bribeIncome / 10;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/getNumberToDisplayPlayerTaxIncome.cpp

@@ -0,0 +1,19 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00459170
+    int GameStateStructures::getNumberToDisplayPlayerTaxIncome(int playerIndex, int taxStep, int currentPopulation)
+    {
+        int taxIncome = 0;
+        if (taxStep > 3) {
+            taxIncome = MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::calculateTaxIncomeForPlayer, this)(
+                            playerIndex, taxStep, currentPopulation)
+                * 4;
+        }
+        return taxIncome / 10;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/getSalePriceOfGood.cpp

@@ -0,0 +1,17 @@
+#include "../GameStateStructures.func.hpp"
+
+#include "OpenSHC/Game/Resources/ResourceType.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    using OpenSHC::Game::Resources::ResourceType;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x004588F0
+    int GameStateStructures::getSalePriceOfGood(ResourceType resourceType)
+    {
+        return this->mapAndTime.buyAndSalesPriceArray[resourceType].salesPrice / 5;
+    }
+
+}
+}

src/OpenSHC/Game/GameStateStructures/getSalesPrice.cpp

@@ -0,0 +1,15 @@
+#include "../GameStateStructures.func.hpp"
+
+namespace OpenSHC {
+namespace Game {
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x0045B7F0
+    int GameStateStructures::getSalesPrice(int playerID, int resourceType)
+    {
+        return (this->mapAndTime.buyAndSalesPriceArray[resourceType].salesPrice / 5)
+            * MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::getSellResourceAmount, this)(
+                playerID, resourceType);
+    }
+
+}
+}