Skip to content

Rewrite map fixes #3324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4 commits merged into from
Jan 16, 2025
+74 −41
Merged

Rewrite map fixes #3324

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b288c5
Rewrite Map: Lower tiles - Bugfixes
jetrotal Jan 6, 2025
b983e20
Rewrite Map: Upper tiles - Bugfixes
jetrotal Jan 6, 2025
8bcba94
Rewrite Map: Tiles AB Initial Support
jetrotal Jan 12, 2025
1e3c78a
Rewrite Map: Lock tiles against going OOB.
jetrotal Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/spriteset_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ void Spriteset_Map::ReplaceDownAt(int x, int y, int tile_index, bool disable_aut
}

void Spriteset_Map::ReplaceUpAt(int x, int y, int tile_index) {
tile_index += BLOCK_F_INDEX;
if (tile_index >= NUM_UPPER_TILES + BLOCK_F_INDEX) tile_index = 0;

auto tile_id = IndexToChipId(tile_index);
tilemap->SetMapTileDataUpAt(x, y, tile_id);
}
Expand Down
2 changes: 1 addition & 1 deletion src/tilemap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ inline void Tilemap::SetMapDataUp(std::vector<short> up) {
}

inline void Tilemap::SetMapTileDataUpAt(int x, int y, int tile_id) {
layer_down.SetMapTileDataAt(x, y, tile_id, true);
layer_up.SetMapTileDataAt(x, y, tile_id, true);
}

inline const std::vector<unsigned char>& Tilemap::GetPassableDown() const {
Expand Down
29 changes: 18 additions & 11 deletions src/tilemap_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,16 @@ void TilemapLayer::SetMapData(std::vector<short> nmap_data) {
map_data = std::move(nmap_data);
}

static inline bool IsAutotileAB(int tile_id) {
return tile_id >= BLOCK_A && tile_id < BLOCK_C;
static inline bool IsTileFromBlock(int tile_id, int block) {
switch (block) {
case BLOCK_A: return tile_id >= BLOCK_A && tile_id < BLOCK_A_END;
case BLOCK_B: return tile_id >= BLOCK_B && tile_id < BLOCK_B_END;
case BLOCK_C: return tile_id >= BLOCK_C && tile_id < BLOCK_C_END;
case BLOCK_D: return tile_id >= BLOCK_D && tile_id < BLOCK_D_END;
case BLOCK_E: return tile_id >= BLOCK_E && tile_id < BLOCK_E_END;
case BLOCK_F: return tile_id >= BLOCK_F && tile_id < BLOCK_F_END;
default: return false;
}
}

void TilemapLayer::SetMapTileDataAt(int x, int y, int tile_id, bool disable_autotile) {
Expand All @@ -732,7 +740,9 @@ void TilemapLayer::SetMapTileDataAt(int x, int y, int tile_id, bool disable_auto

substitutions = Game_Map::GetTilesLayer(layer);

if (disable_autotile) {
bool is_autotile = IsTileFromBlock(tile_id, BLOCK_A) || IsTileFromBlock(tile_id, BLOCK_B) || IsTileFromBlock(tile_id, BLOCK_D);

if (disable_autotile || !is_autotile) {
RecreateTileDataAt(x, y, tile_id);
} else {
// Recalculate the replaced tile itself + every neighboring tile
Expand All @@ -743,12 +753,7 @@ void TilemapLayer::SetMapTileDataAt(int x, int y, int tile_id, bool disable_auto
};

// TODO: make it work for AB autotiles
if (IsAutotileAB(tile_id)) {
RecreateTileDataAt(x, y, tile_id);
Output::Warning("Maniac Patch: Autotiles A and B in RewriteMap are only partially supported.");
} else {
RecalculateAutotile(x, y, tile_id);
}
RecalculateAutotile(x, y, tile_id);

for (const auto& adj : adjacent) {
auto nx = x + adj.dx;
Expand Down Expand Up @@ -794,8 +799,10 @@ static inline void ApplyCornerFixups(uint8_t& neighbors) {

void TilemapLayer::RecalculateAutotile(int x, int y, int tile_id) {
// TODO: make it work for AB autotiles
if (IsAutotileAB(tile_id)) {
Output::Warning("Maniac Patch: Autotiles A and B in RewriteMap are only partially supported.");
bool is_tileAB = IsTileFromBlock(tile_id, BLOCK_A) || IsTileFromBlock(tile_id, BLOCK_B);
if (is_tileAB) {
RecreateTileDataAt(x, y, tile_id);
Output::Warning("Maniac Patch: Autotiles AB in RewriteMap are only partially supported.");
return;
}

Expand Down
Loading