Attempting to merge the master branch with the Ex-15 branch produces a few merge errors in GUI code where I do not know the intention of the code well enough to resolve the merges.
Ranran - would you be able to resolve the conflicts? Thank you.
This seems to be a conflict with ceeac's changes.
https://github.com/Ranran-the-JuicyPork/simutrans-exp/commit/d68b3ac56de289df8cbc3a6c318c4ccdc89b802b
in boden/wege/weg.h
int get_statistics(way_stat_months month, way_statistics type) const { return statistics[(int)month][(int)type]; }
Is there any intention to make it different from the standard code?
https://github.com/aburch/simutrans/blob/399b2d4f09a3fc24b56ce693dbb3f0aa58c26985/src/simutrans/obj/way/weg.h#L238
extended was the same except that constant 1 was replaced with a macro.
EDIT:
I think it was probably intended for integration with get_stat().
EDIT2:
I believe the conflict has been resolved.
Test the branch below.
https://github.com/Ranran-the-JuicyPork/simutrans-exp/tree/ex15-2301_2