Belugas wrote:

I may have found a way to fix it.
Two problems:

1. the assumption that anything above sea level must be a canal
2. the omission to add river to the has_water condition
   Here is the patch i am proposing

Attachments

• fs1676.patch (1.08 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1676#comment3417

Belugas wrote:

yeah... a not related additionnal line feed for code breathing purpose ;)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1676#comment3418

frosch wrote:

If I am not mistaken, that does also not result in rivers.

Btw. I would prefer a really clean solution here. Looking into openttd.cpp reveals that this is about the fifth time, that canals/sea get converted in savegames :)

I thought about changing the map array in the following way:
- Remove WATER_TILE_RIVER and store rivers with WATER_TILE_CLEAR (like canals and sea).
- Add a WaterClass type in m3 bits 0 to 1 (this position is used for railway and road types in MP_STATION) to differ between sea, canals, and rivers.
- This WaterClass can be used in all water stuff (clear water, depot, dock, buoy) as these bits are free. I.e. also remove the water_owner from shipdepot.
- Preserve WaterClass when building/removing things on water.

That would also allow to draw matching ground sprites under shipdepots, docks and buoys. (Though that would require to store the random bits of canals and rivers also in MP_STATION. m4 would be free, but perhaps it is not the best choice.)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1676#comment3420

peter1138 wrote:

That sounds reasonable to me. Random bits can just return zero for docks, as I doubt it is necessary there.

Any downsides?

This comment was imported from FlySpray: https://bugs.openttd.org/task/1676#comment3421

Belugas wrote:

I like the idea too, as it would make the code clearer.
As for downsides, who knows...

This comment was imported from FlySpray: https://bugs.openttd.org/task/1676#comment3422

peter1138 closed the ticket.

Reason for closing: Fixed

In r12042

This comment was imported from FlySpray: https://bugs.openttd.org/task/1676