[gynt]

Summary

Reimplements 88 Map::TileMapState functions that match the original at 100%, taken from reimpl/TileMapState. The 17 TileMapState files already on main are unchanged.

• Every function here measured 100% (raw, or normalized where only call targets differ) on reimpl/TileMapState, and again in a trial build of this branch with the data and function resolvers enabled.
• The status lines of all 88 are set to 100.0% | Reimplemented.

Header changes

Each is in its own commit and limited to what these functions use:

• Moat: tile is int (main's own UpgradeMapLogicToVersion_Unknown3 already reads it as *(uint*)&). x/y are short and fillProgress is char; both are tested signed in the original.
• Rock::x/y: short, read with movsx.
• Unit::field_0x83: a byte field rather than padding; triggerLoweredView clears it.
• TileMapState:
  • signed int counters and flags: maxPitchDitchCount, temporaryTerrainTypeIndex, SEC_Section1052..1054, the forceUpdate* flags and buildingMin/MaxHeight
  • MacroLayer is short, read with movsx everywhere
  • mapping40x40 is char
  • field_0x5548d0 is a field rather than padding
• validateWallPlacementAtTile takes its mapper command as short. The original compares it as a word, and that is what took the function from 81% to 100%.

These are generated headers, so the same changes need to go into Ghidra too.

LTCG

16 of these functions are added to cmake/compiler-flags-gl.txt, together with their already-finished callees, getBuildingSizeIndexMappingData among them.

• The original keeps this in ecx across those calls. Only /GL with the callee compiled and enabled reproduces that; without it these functions measure 40-65%.
• Only entries that measured better are listed.

Behaviour fixes

• spawnEraserTileEffect no longer clears L_BUILDING; the original's mask is ~0x410b00.
• placeDefensiveStructureTile gets its missing M_MAPPER_STAIR5 arm.
• setupAllMapSections calls the empty 0x469F10 with UnitsState/LandscapeState in ecx, as the original does, through a __fastcall cast of DoNothing (as processGameTick does).

Note

updateBuildingPlacementRotationPreview, which is already on main, measures 46% in the trial build. It needs its /GL callee determineBuildingPlacementRotation, which is not finished yet and so is not part of this PR. This PR does not change that function.

Functions

Constructor_TileMapState, advanceMoatDigProgress, applyRockGraphicsToFootprint, changeMapOrientation, clearBuildingDisplayFlagsAndEntities, clearBuildingFootprintAndRemoveSiegeTower, clearBuildingFootprintAndResetUnits, clearBuildingFootprintWithEdgeRubble, clearBuildingFromTerrain, clearBuildingTilesAndTrees, clearDrawBridgeWater, clearFixedSizeTwoBuildingFootprint, clearInvalidMoatEntries, clearMoat, clearMoatDataAtTile, collectCliffEdgeTilesForClimbData, computeClimbRampRotation, computeTileAlongAxisOffset, computeWallCornerRenderRotation, countLogicPropertyInSurroundingTiles, countMoatsOwnedByEachPlayer, countUnfinishedMoatTilesForPlayer, countUnownedPitchDitches, createMoatData, destroyPitchDitch, destroyWallsOfPlayer, findNearestValidDigTileNearTarget, findTileInSameAreaAndNoTooHeightDifference, getBuildingHurtSFXID, getBuildingSizeForCommandBuildingType, getBuildingSizeIndexMappingData, getCastleBuildRangeForMapSize, getMaxWallHeightInBrushArea, getNonFarmFieldBuildingHealthAtTileOr1000, getOrientationThatIsWallTowerOrGatehouse, getPitchDitchIDForTile, getRubbleGraphicStageForDamageLevel, getTileForBrush, getTotalHeightAtTile, getWallFlagForOrientedDirection, hasHigherNeighborWithStairs, hasHigherPlainNeighborWithWallOrGatehouse, hasOnlyTowerNeighborsNoWalls, increaseHeightForTunnelSingleTile, increaseHeightForTunnelWithBrush, isCliffDropInDirection, isFootprintIndexOnEdge, isTileEnclosedByWalls, isTileEnclosedByWallsOrGates, isWallConnectionHeightValid, isWallCornerForCardinalDirection, isWallCornerForDiagonalDirection, markBuildingFootprintFlag, noop1, placeDefensiveStructureTile, planMoat, rebuildShowHiLayerFromHeights, removeMoat, resetAreaBasedOnLogicalLayer, resetHeightAndMapBorders, resetTileAndClearMoat, resetTileToDefaultState, returnMoatIDForPlayerIDs, returnOwnedMoatAtTile, rotateFearFactorBuildingVariations, setChangedLayerToThreeAndMapping0x40x40, setMapSize, setSignpostDistanceForCampaignMission, setupAllMapSections, setupBuildingSizeIndexMapping, setupLogicalMapBorders, setupTileMapSections, spawnEraserTileEffect, storeMinAndMaxHeightOfArea, swapMoatOwnership, swapPitchOwnership, swapWallOwnership, triggerLoweredView, unmarkBuildingFootprintFlag, updateAreaBasedOnSurrounding, updateGameRelatedValue, updateMacroLayer, updatePathLinkagesForBuilding, updatePitchDitches, updateShowHiLayerOrResetChangedLayer, upgradeMapFormatLogicLayer, validateBuildingPlacementAtTile, validateWallPlacementAtTile

🤖 Generated with Claude Code

https://claude.ai/code/session_01XmXCmaNCgNNvTDAKE2qbZC

[github-actions]

Style guide reading (advisory, posted once)

30 possible deviation(s) from REIMPLEMENTATION_STYLE_GUIDE.md across 21 of the 88 reimplemented .cpp file(s) in this PR.

The match comes first. Where the ugly form is what matched, it stays -- that is the guide's own overriding rule, and rule 21 asks for a one-line comment saying what was measured so the next reader does not retry it. This report is posted once, when the PR opens, and is not repeated on later pushes.

rule	what it asks	hits
1	Drop the decompiler trailing return;	1
8	Let the compiler unroll	4
9	Prefer for over while/do	13
18	Use the name, not the number	12

Where

Rule 1 — Drop the decompiler trailing return;

• src/OpenSHC/Map/TileMapState/getBuildingSizeIndexMappingData.cpp:31 — trailing return; in a void function

Rule 8 — Let the compiler unroll

• src/OpenSHC/Map/TileMapState/rebuildShowHiLayerFromHeights.cpp:11 — loop steps by 8; try the plain loop and let MSVC unroll
• src/OpenSHC/Map/TileMapState/setupAllMapSections.cpp:61 — loop steps by 6; try the plain loop and let MSVC unroll
• src/OpenSHC/Map/TileMapState/setupLogicalMapBorders.cpp:14 — loop steps by 2; try the plain loop and let MSVC unroll
• src/OpenSHC/Map/TileMapState/swapWallOwnership.cpp:11 — loop steps by 6; try the plain loop and let MSVC unroll

Rule 9 — Prefer for over while/do

• src/OpenSHC/Map/TileMapState/applyRockGraphicsToFootprint.cpp:28 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/clearBuildingDisplayFlagsAndEntities.cpp:19 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintAndRemoveSiegeTower.cpp:28 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintAndResetUnits.cpp:25 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintWithEdgeRubble.cpp:24 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/clearDrawBridgeWater.cpp:14 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/clearFixedSizeTwoBuildingFootprint.cpp:21 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/markBuildingFootprintFlag.cpp:14 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/resetHeightAndMapBorders.cpp:29 — do-loop; the guide asks for a for
• src/OpenSHC/Map/TileMapState/storeMinAndMaxHeightOfArea.cpp:21 — do-loop; the guide asks for a for
• ... and 3 more

Rule 18 — Use the name, not the number

• src/OpenSHC/Map/TileMapState/clearBuildingFootprintAndResetUnits.cpp:34 — hex constant 0xFFDF; use a name, or decimal
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintAndResetUnits.cpp:44 — hex constant 0x2000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintAndResetUnits.cpp:46 — hex constant 0x4000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintWithEdgeRubble.cpp:33 — hex constant 0xFFDF; use a name, or decimal
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintWithEdgeRubble.cpp:43 — hex constant 0x2000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/clearBuildingFootprintWithEdgeRubble.cpp:45 — hex constant 0x4000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/clearFixedSizeTwoBuildingFootprint.cpp:34 — hex constant 0x4000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/destroyPitchDitch.cpp:21 — hex constant 0x2000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/destroyPitchDitch.cpp:23 — hex constant 0x4000; use a name, or decimal
• src/OpenSHC/Map/TileMapState/markBuildingFootprintFlag.cpp:21 — hex constant 0xFFF3; use a name, or decimal
• ... and 2 more

[gynt]

Unnecessary casts?

[gynt]

Removed in a50bdcf, together with the other casts in the branch whose removal leaves the per-function asm and the warnings unchanged (50 in total). The ones that stay change codegen (e.g. the (uint) before >>) or are needed to compile.

[gynt]

Use MapOrientation enum values for the map orientation (field type will change).

[gynt]

Done in 51479bd, after merging main (6f522f7) where the field became MapOrientationInt: the switch cases and all mapOrientation comparisons in the branch now use MO_NORTH/MO_EAST/MO_SOUTH/MO_WEST. reccmp unchanged.

[gynt]

Wouldn't a switch-case be better here? Test if a switch case compiles the same

[gynt]

Tested: as a switch on buildingType (same case order) the function drops from 100% to 61.0% (normalized 57.5%). MSVC builds a jump table, while the original is a compare chain, so the if/else-if chain stays.

[gynt]

0 instead of '\0'

[gynt]

Done in 6ad2a6c: all 30 fill bytes passed to fillMemory_ByteValue are now 0 (29 here, 1 in setupAllMapSections.cpp). Codegen unchanged.