assertion failed with map enlargement

[Dwachs]

For map number 8751, size 16x192, water level -2, mountain height 320, map roughness 7, I get an assertion failed when enlarging to 40x192 (no rotation).

This small patch cures this, but I am not sure whether it breaks other things:

Code Select Expand

Index: simworld.cc
===================================================================
--- simworld.cc (revision 2713)
+++ simworld.cc (working copy)
@@ -1363,6 +1363,8 @@
}
}

+ cleanup_karte( old_x, old_y );
+
// smoothing the seam (if possible)
for (sint16 x=1; x<old_x; x++) {
koord k(x,old_y);
@@ -1399,8 +1401,6 @@
}
}

- cleanup_karte( old_x, old_y );
-
// eventuall update origin
switch( einstellungen->get_rotation() ) {
case 1:

[prissi]

The cleanup is nessesary, as omitting it may produce broken slopes. I will did into it.

[prissi]

Well, there are in the first rund illegal hieght differences. (simworld.cc line 1747) However it seems in further round those go away. And it happens only because near the border during enlargement is a very height mountain. It is an error, but I have no easy idea how to fix it without slowing down normal operation considerable.

[Dwachs]

for me this was fixed, by moving the cleanup-call some lines up.

[Dwachs]

fixed in r4352/