Skip to content

fix(server): restore filename tiling after map swap reload #573

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
zoeyrose merged 2 commits into from
Oct 10, 2026
Merged

fix(server): restore filename tiling after map swap reload #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34d6855
fix(server): restore filename tiling after map swap reload
zoeyrose Oct 9, 2026
14609d1
fix(server): restore temporary map links without schema guard
zoeyrose Oct 10, 2026
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
168 changes: 91 additions & 77 deletions server/src/server/map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,85 @@ void map_set_tile(mapstruct *m, int tile, const char *pathname) {
}
}

/**
* Restore coordinate-filename links after reading either a source or temporary
* map header. Celestial saves omit derived links, so both loaders must rebuild
* them before validating the sky anchor. Authored paths remain authoritative.
*/
static void derive_map_filename_tiles(mapstruct *m, const char *pathname, int flags) {
char split[MAX_BUF];
const char *basename;
size_t pos, coords_idx, coords_len;
int16_t old_style_z;

basename = strrchr(m->path, flags & MAP_PLAYER_UNIQUE ? '$' : '/');
if (basename == NULL) {
basename = m->path;
} else {
basename++;
}

pos = coords_idx = 0;
coords_len = 0;
old_style_z = 0;

while (string_get_word(basename, &pos, '_', split, sizeof(split), 0)) {
if (strlen(split) == 1) {
old_style_z = string_isdigit(split) ? atoi(split) : 'a' - *split - 1;
} else if (strlen(split) > 3) {
/* TODO: remove this hack (avoids parsing old-style naming
* convention like map_0101) */
continue;
}

if (string_isdigit(split)) {
coords_len += strlen(split) + 1;
m->coords[coords_idx] = atoi(split);
coords_idx++;
}

if (coords_idx >= arraysize(m->coords)) {
break;
}
}

if (coords_idx >= 2) {
size_t i;
char *cp, *cp2, path[HUGE_BUF];

cp = string_sub(pathname, 0, -coords_len);

for (i = 0; i < TILED_NUM; i++) {
if (m->tile_path[i] != NULL) {
continue;
}

snprintf(VS(path),
"%s_%d_%d",
cp,
m->coords[0] + map_tiled_coords[i][0],
m->coords[1] + map_tiled_coords[i][1]);

if (m->coords[2] + map_tiled_coords[i][2] != 0) {
snprintfcat(VS(path), "_%d", m->coords[2] + map_tiled_coords[i][2]);
}

if ((!(flags & MAP_NO_DYNAMIC) &&
((m->coords[2] >= 0 && i != TILED_UP && i != TILED_DOWN) ||
(m->coords[2] > 0 && i != TILED_UP))) ||
path_exists(path)) {
cp2 = path_basename(path);
map_set_tile(m, i, cp2);
free(cp2);
}
}

free(cp);
} else {
m->coords[2] = old_style_z;
}
}

/**
* Opens the file "filename" and reads information about the map
* from the given file, and stores it in a newly allocated
Expand All @@ -1138,10 +1217,7 @@ void map_set_tile(mapstruct *m, int tile, const char *pathname) {
mapstruct *load_original_map(const char *filename, mapstruct *originator, int flags) {
FILE *fp;
mapstruct *m;
char pathname[HUGE_BUF], split[MAX_BUF];
const char *basename;
size_t pos, coords_idx, coords_len;
int16_t old_style_z;
char pathname[HUGE_BUF];

/* No sense in doing this all for random maps, it will all fail anyways. */
if (!strncmp(filename, "/random/", 8)) {
Expand Down Expand Up @@ -1189,81 +1265,13 @@ mapstruct *load_original_map(const char *filename, mapstruct *originator, int fl

if (fp != NULL && !load_map_header(m, fp)) {
log_error("Failure loading map header for %s, flags=%d", filename, flags);
free_map(m, 1);
delete_map(m);
fclose(fp);
return NULL;
}

basename = strrchr(filename, flags & MAP_PLAYER_UNIQUE ? '$' : '/');
if (basename == NULL) {
basename = filename;
} else {
basename++;
}

pos = coords_idx = 0;
coords_len = 0;
old_style_z = 0;

while (string_get_word(basename, &pos, '_', split, sizeof(split), 0)) {
if (strlen(split) == 1) {
old_style_z = string_isdigit(split) ? atoi(split) : 'a' - *split - 1;
} else if (strlen(split) > 3) {
/* TODO: remove this hack (avoids parsing old-style naming
* convention like map_0101) */
continue;
}

if (string_isdigit(split)) {
coords_len += strlen(split) + 1;
m->coords[coords_idx] = atoi(split);
coords_idx++;
}

if (coords_idx >= arraysize(m->coords)) {
break;
}
}

if (coords_idx >= 2) {
size_t i;
char *cp, *cp2, path[HUGE_BUF];

const char *path_cp = pathname;
if (real_path != NULL) {
path_cp = create_pathname(real_path);
}
cp = string_sub(path_cp, 0, -coords_len);

for (i = 0; i < TILED_NUM; i++) {
if (m->tile_path[i] != NULL) {
continue;
}

snprintf(VS(path),
"%s_%d_%d",
cp,
m->coords[0] + map_tiled_coords[i][0],
m->coords[1] + map_tiled_coords[i][1]);

if (m->coords[2] + map_tiled_coords[i][2] != 0) {
snprintfcat(VS(path), "_%d", m->coords[2] + map_tiled_coords[i][2]);
}

if ((!(flags & MAP_NO_DYNAMIC) &&
((m->coords[2] >= 0 && i != TILED_UP && i != TILED_DOWN) ||
(m->coords[2] > 0 && i != TILED_UP))) ||
path_exists(path)) {
cp2 = path_basename(path);
map_set_tile(m, i, cp2);
free(cp2);
}
}

free(cp);
} else {
m->coords[2] = old_style_z;
}
derive_map_filename_tiles(m, real_path != NULL ? create_pathname(real_path) : pathname, flags);

if (m->level_max == 0 && m->coords[2] >= 0) {
m->level_max = INT8_MAX;
Expand All @@ -1280,6 +1288,7 @@ mapstruct *load_original_map(const char *filename, mapstruct *originator, int fl
char error[HUGE_BUF];
if (!celestial_structure_validate_header(m, VS(error))) {
LOG(ERROR, "Celestial structural header validation failed: %s", error);
free_map(m, 1);
delete_map(m);
fclose(fp);
return NULL;
Expand Down Expand Up @@ -1341,7 +1350,7 @@ mapstruct *load_original_map(const char *filename, mapstruct *originator, int fl
* The map object we load into (this can change from the passed
* option if we can't find the original map).
*/
static mapstruct *load_temporary_map(mapstruct *m) {
static mapstruct *load_temporary_map(mapstruct *m, int flags) {
FILE *fp;
char buf[HUGE_BUF];

Expand Down Expand Up @@ -1375,11 +1384,13 @@ static mapstruct *load_temporary_map(mapstruct *m) {
m->path,
m->tmpname);
snprintf(buf, sizeof(buf), "%s", m->path);
free_map(m, 1);
delete_map(m);
m = load_original_map(buf, NULL, 0);
fclose(fp);
return m;
}
derive_map_filename_tiles(m, create_pathname(m->path), flags & MAP_NO_DYNAMIC);
if (m->celestial_v1_header_seen) {
char error[HUGE_BUF];
if (!celestial_structure_validate_header(m, VS(error))) {
Expand All @@ -1389,6 +1400,7 @@ static mapstruct *load_temporary_map(mapstruct *m) {
m->tmpname,
error);
snprintf(VS(buf), "%s", m->path);
free_map(m, 1);
delete_map(m);
m = load_original_map(buf, NULL, 0);
fclose(fp);
Expand Down Expand Up @@ -1845,7 +1857,9 @@ void free_map(mapstruct *m, int flag) {
STRING_SAFE(m->tile_map[i]->path));
}

m->tile_map[i]->tile_map[map_tiled_reverse[i]] = NULL;
if (m->tile_map[i]->tile_map[map_tiled_reverse[i]] == m) {
m->tile_map[i]->tile_map[map_tiled_reverse[i]] = NULL;
}
m->tile_map[i] = NULL;
}

Expand Down Expand Up @@ -1959,7 +1973,7 @@ mapstruct *ready_map_name(const char *name, mapstruct *originator, int flags) {
}
} else {
/* If in this loop, we found a temporary map, so load it up. */
m = load_temporary_map(m);
m = load_temporary_map(m, flags);

if (m == NULL) {
return NULL;
Expand Down
Loading