Reimpl/tile map state

src/OpenSHC/Map/LogicHelpers/Logic1.hpp

@@ -20,6 +20,7 @@ namespace Map {
             L_PLAIN2_AND_PITCH = 8, // 0x00000008
             L_BORDER = 16, // 0x00000010
             L_BORDER_EDGE = 32, // 0x00000020
+            L_UNNAMED_0x40 = 64, // 0x00000040
             L_ROCKY = 128, // 0x00000080
             L_WALL_OR_GATEHOUSE = 256, // 0x00000100
             L_CRENEL = 512, // 0x00000200

src/OpenSHC/Map/Moat.hpp

@@ -15,10 +15,9 @@ namespace Map {
     // SIZE: 0x00000010
     typedef struct Moat {
 
-        ushort tile; // 0x00000000 length: 2
-        undefined1 padding_0x2[2]; // 0x00000002 length: 2
-        undefined2 x; // 0x00000004 length: 2
-        undefined2 y; // 0x00000006 length: 2
+        int tile; // 0x00000000 length: 4
+        short x; // 0x00000004 length: 2
+        short y; // 0x00000006 length: 2
         short zeroOrTwo; // 0x00000008 length: 2
         undefined1 padding_0xa[2]; // 0x0000000A length: 2
         char owner; // 0x0000000C length: 1

src/OpenSHC/Map/TerrainDefinedData.hpp

@@ -43,9 +43,8 @@ namespace Map {
         XYPair StockpilePathableOffsets[9]; // 0x000001DC length: 72
         undefined1 padding_0x224[64]; // 0x00000224 length: 64
         XYPair field130_0x264[3][12]; // 0x00000264 length: 288
-        Point8IntXY unkXYOffsets_0x384[8]; // 0x00000384 length: 64
-        Point8IntXY field132_0x3c4[8]; // 0x000003C4 length: 64
-        undefined1 padding_0x404[64]; // 0x00000404 length: 64
+        Point8IntXY keepOutbuildingOffsets_0x384[3][4]; // 0x00000384 length: 96
+        Point8IntXY keepOutbuildingOffsets_0x3e4[3][4]; // 0x000003E4 length: 96
         XYPair field197_0x444[24]; // 0x00000444 length: 192
         undefined1 padding_0x504[8]; // 0x00000504 length: 8
         XYPair field206_0x50c; // 0x0000050C length: 8

src/OpenSHC/Map/TileMapState.hpp

@@ -76,31 +76,31 @@ namespace Map {
         uchar unitDeathHeatMap[80400]; // 0x00428370 length: 80400
         uchar SEC_TileMap1104[80400]; // 0x0043BD80 length: 80400
         uchar SEC_PathfindingCostTileMap1105[9][80400]; // 0x0044F790 length: 723600
-        undefined4 someIndex; // 0x00500220 length: 4
-        undefined4 someLimit; // 0x00500224 length: 4
-        undefined4 someYLike; // 0x00500228 length: 4
-        undefined4 someYLikeLimit; // 0x0050022C length: 4
-        byte mapping40x40[40][40]; // 0x00500230 length: 1600
+        int someIndex; // 0x00500220 length: 4
+        int someLimit; // 0x00500224 length: 4
+        int someYLike; // 0x00500228 length: 4
+        int someYLikeLimit; // 0x0050022C length: 4
+        char mapping40x40[40][40]; // 0x00500230 length: 1600
         Moat moats[16000]; // 0x00500870 length: 256000
         int currentMoatCount; // 0x0053F070 length: 4
         undefined4 moatTileCount; // 0x0053F074 length: 4
         undefined4 ALG_MoatXResult; // 0x0053F078 length: 4
         undefined4 ALG_MoatYResult; // 0x0053F07C length: 4
         int someMoatTile; // 0x0053F080 length: 4
         PitchDitch pitchDitches[4000]; // 0x0053F084 length: 80000
-        undefined4 maxPitchDitchCount; // 0x00552904 length: 4
+        int maxPitchDitchCount; // 0x00552904 length: 4
         undefined1 padding_0x552908[4]; // 0x00552908 length: 4
         short specialAreasArray[8]; // 0x0055290C length: 16
-        undefined4 temporaryTerrainTypeIndex; // 0x0055291C length: 4
-        undefined4 SEC_Section1052; // 0x00552920 length: 4
-        undefined4 SEC_Section1053; // 0x00552924 length: 4
-        undefined4 SEC_Section1054; // 0x00552928 length: 4
+        int temporaryTerrainTypeIndex; // 0x0055291C length: 4
+        int SEC_Section1052; // 0x00552920 length: 4
+        int SEC_Section1053; // 0x00552924 length: 4
+        int SEC_Section1054; // 0x00552928 length: 4
         int temporaryTerrainTypeArray[1000]; // 0x0055292C length: 4000
         int temporaryTerrainTypeBinaryArray[1000]; // 0x005538CC length: 4000
         undefined4 forceUpdateLogicalAndMiscDisplayLayers; // 0x0055486C length: 4
-        undefined4 forceUpdateTextureTilemap; // 0x00554870 length: 4
-        undefined4 forceUpdateGFXLayers; // 0x00554874 length: 4
-        undefined4 forceUpdateMacroLayerFlag; // 0x00554878 length: 4
+        int forceUpdateTextureTilemap; // 0x00554870 length: 4
+        int forceUpdateGFXLayers; // 0x00554874 length: 4
+        int forceUpdateMacroLayerFlag; // 0x00554878 length: 4
         undefined4 field68_0x55487c; // 0x0055487C length: 4
         undefined1 padding_0x554880[8]; // 0x00554880 length: 8
         undefined4 placedBuildingID; // 0x00554888 length: 4
@@ -121,7 +121,7 @@ namespace Map {
         undefined4 refreshRelatedOne; // 0x005548C4 length: 4
         undefined4 disableElevationRendering; // 0x005548C8 length: 4
         undefined4 flatViewToggleValue1; // 0x005548CC length: 4
-        undefined1 padding_0x5548d0[4]; // 0x005548D0 length: 4
+        undefined4 field95_0x5548d0; // 0x005548D0 length: 4
         undefined4 flatViewToggleValue2; // 0x005548D4 length: 4
         undefined4 refreshRelatedTwo; // 0x005548D8 length: 4
         undefined4 savedEditorActiveBrush; // 0x005548DC length: 4
@@ -156,8 +156,8 @@ namespace Map {
         undefined4 buildingSpriteID2; // 0x00554950 length: 4
         undefined4 cursorTargetID; // 0x00554954 length: 4
         undefined4 buildingHeightLimit; // 0x00554958 length: 4
-        undefined4 buildingMinHeight; // 0x0055495C length: 4
-        undefined4 buildingMaxHeight; // 0x00554960 length: 4
+        int buildingMinHeight; // 0x0055495C length: 4
+        int buildingMaxHeight; // 0x00554960 length: 4
         undefined4 buildingMaxHeightDifference; // 0x00554964 length: 4
         undefined4 buildingPlacementProperty_3; // 0x00554968 length: 4
         undefined4 buildingPlacementProperty_4; // 0x0055496C length: 4

src/OpenSHC/Map/TileMapState/Constructor_TileMapState.cpp

@@ -0,0 +1,66 @@
+#include "../TileMapState.func.hpp"
+
+#include "OpenSHC/Commands/MappersEnum.hpp"
+#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"
+
+#include "OpenSHC/Globals/DAT_GameCore.hpp"
+#include "OpenSHC/Globals/DAT_GameState.hpp"
+
+namespace OpenSHC {
+namespace Map {
+
+    using OpenSHC::Commands::MappersEnum;
+    using OpenSHC::WindowsHelper::Enums::BOOLEnum;
+
+    // FUNCTION: STRONGHOLDCRUSADER 0x00515F40
+    TileMapState* TileMapState::Constructor_TileMapState()
+    {
+        MACRO_CALL_MEMBER(OpenSHC::Map::TileMapState_Func::setupMovementDirectionTranslationMatrix, this)();
+        MACRO_CALL_MEMBER(OpenSHC::Map::TileMapState_Func::setupBuildingSizeIndexMapping, this)();
+        MACRO_CALL_MEMBER(OpenSHC::Map::TileMapState_Func::setupTileMapSections, this)();
+        this->editorActiveBrush = 7;
+        this->refreshCertainTileMap = 2;
+        this->counter1 = 0;
+        this->mapperMax = FALSE;
+        this->editorSnapToMode = 0;
+        this->editorAffectType = 0;
+        this->unknownZero_0x554900 = 0;
+        this->currentMapperCommand = OpenSHC::Commands::M_MAPPER_NULL;
+        this->refreshRelatedOne = 1;
+        this->disableElevationRendering = 0;
+        this->refreshRelatedTwo = 0;
+        this->forceUpdateLogicalAndMiscDisplayLayers = 1;
+        this->forceUpdateTextureTilemap = 1;
+        this->forceUpdateGFXLayers = 1;
+        this->refreshCertainTileMap_old = 4;
+        MACRO_CALL_MEMBER(OpenSHC::Map::TileMapState_Func::setChangedLayerToThreeAndMapping0x40x40, this)();
+        this->moatTileCount = 0;
+        this->skipPlacementCheck = 0;
+        this->gateOrientationVariant = 0x50;
+        this->lastTime = timeGetTime();
+        this->rockOrientation = 0;
+        this->editorRockType = 0;
+        this->cursorAnimationTime = timeGetTime();
+        this->cursorOverlayAnimationFrame = 1;
+        this->temporaryTerrainTypeIndex = 0;
+        this->skipPlacementFailChecks = 0;
+        DAT_GameCore::instance.isTimeHalted = FALSE;
+        DAT_GameState::instance.mapAndTime.skirmishFogOfWar = 0;
+        this->ptr_LogicLayer = this->LogicLayer;
+        this->ptr_ChangedLayer = this->ChangedLayer;
+        this->ptr_TerrainTypeTileMap = this->Logic2Layer;
+        this->ptr_TerrainHeightTileMap = this->HeightLayer;
+        this->ptr_PathConnectionLayer = this->PathConnectionLayer;
+        this->ptr_OccupancyLayer = this->OccupancyLayer;
+        this->ptr_DamageLayer = this->DamageLayer;
+        this->ptr_MiscDisplayLayer = this->MiscDisplayLayer;
+        this->ptr_MovementDirectionTranslationMatrix = this;
+        this->ptr_SpecialAreasArray = this->specialAreasArray;
+        this->ptr_AIZoneLayer = this->AIZoneLayer;
+        this->currentMoatCount = 16000;
+        this->maxPitchDitchCount = 4000;
+        return this;
+    }
+
+}
+}