[RDY] Rollback recent spawn function changes in hardcoded mapgen

[ZhilkinSerg]

Fixes #22895.

What was changed

• rollback changes from #22847;
• rollback most changes from #22852 (start_location.h left intact);
• rollback changes from #22854.

[ZhilkinSerg]

I believe it would be better to properly fix #3951 while moving hard-coded mapgen to json.

[ZhilkinSerg]

Not strictly related:

I want to change SEEX * 2 and SEEY * 2 in mapgen.cpp and mapgen_functions.cpp to make translation to json somewhat easier.

Will it be correct to name defs like this?

#def SUBMAP_WIDTH (SEEX * 2)
#def SUBMAP_MAX_X (SUBMAP_WIDTH - 1)

#def SUBMAP_HEIGHT (SEEY * 2)
#def SUBMAP_MAX_Y (SUBMAP_HEIGHT - 1)

In other words:

How do we call square with SEEX * 2 and SEEY * 2 dimensions? Is it submap?

[BevapDin]

How do we call square with SEEX * 2 and SEEY * 2 dimensions? Is it submap?

A submap contains lots of foo_type foo[SEEX][SEEY];, so a submap is SEEX times SEEY map squares large.

SEEX * 2 is the size of the overmap terrain, expressed as number of map squares. It's also the number of map squares of the map used for mapgen (tinymap), maybe that can give it the name (which should probably be local to the mapgen files).

[ZhilkinSerg]

Thanks, @BevapDin! So it is like this:

SM = SUBMAP = SEEX * SEEY OMT = OVERMAP_TERRAIN = SM * 2 * 2 = SEEX * 2 * SEEY * 2

And I can probably go with this names:

#def OMT_WIDTH (SEEX * 2)
#def OMT_MAX_X (OMT_WIDTH - 1)

#def OMT_HEIGHT (SEEY * 2)
#def OMT_MAX_Y (OMT_HEIGHT - 1)

---

Edit: Also found #11880, so OMT_ could be bad name, but if that issue is addressed SEEX/SEEY will be doubled and SEEX * 2 will simply disappear from code.

[boydkr]

Can we prioritize a merge on this? The bug is pretty game-breaking

[anubiann00b]

There's a linked build here, for any players seeing this and wanting a quick fix: #22895 (comment)