MagicBuzz wrote:
Hello,
Is that possible to make a new diff compatible with the current trunk ?
Actually, there are some new features about newgrf and engines, that break the current diff file.
So I have noticed.

Please see attachment but read the rest of the post first please.
BR 155 wrote:
MagicBuzz wrote:
I tried to resolve the conflicts myself, but on one computer I can't compile anymore, and on the another one, that's quite worse : it compiles but savegames are broken on some brige_tile assertion, and the wxorking savegame just looks strange : my opponents' vehicles come to my stations

?:
Nice, you found a new and working infrastructure-sharing code by accident? That would be amazing

.
IS without IS patch? Cool, well kind off ...

Can I please see your diff before you revert your source?
WARNING Please read the entire post carefully ...
Attached patch is pulled from my testfolder and not playtested other than to check some of the changes I have made and backwards savegame compatibility.
Only download if you are willing to accept that:
- This version may contain errors.
- Code will change between this version and v11.
- Savegames made with this version might be lost in the next version.
WIP v10_9_9_3_experimental
=====================
Updated:
-----------
- Departureboardswallclock8b4
- More Height Levels (Experimental aircraft code and no new patch yet -> will be v33 when tested more.)
- CargoDist_r21077
- Station-build-gui_v7 (By sbr) (Waypoint window also resizable now.)
Added:
--------
- Departure_vehicletimetableskip1 (By hthhs)
- Option to select treeline ingame in Advanced Settings -> Construction (Independant from mapgeneration.) (NekoMaster) (*)
Fixed:
--------
- Partial fix for copypaste preview. Rails now show again.
- Do the same fix for treeline as was done for snowline in r21078
- Aircraft entering the map at too low altitude (Kogut) (**)
New files in the widgets folder: (station/waypoint build gui)
--------------------------------------
- station_type_matrix.cpp
- station_type_matrix.h
Notes:
--------
(*) Sometimes when selecting the treeline on new game generation the up arrow does not change its enabled/disabled state. Changing climate and switching back (forcing a gui redraw) will update its status. Obviously this is something that remains to be dealt with.
(**) I Have not yet checked the disaster vehicles.
More important notes:
-----------------------------
- The next version will be v11 and should be savegame compatible with this version but this is not guaranteed.
- May I
strongly suggest to make a backup of your savegame or install this version as a seperate install untill I am sure that it will remain compatible. (Even I do not overwrite my savegame with this version!)
- Please do
not post a pre-compiled binary of this version as minor changes to the code still have to, and will, be made before posting v11. Let's not cause trouble for people not able to compile themselves ...
Keeping savegame compatibility for players that have added the cd_no_overload_patch before:
-----------------------------------------------------------------------------------------------------------------
- Apply the new version of the patchpack.
- Re-apply the no_overload_patch (while changing SL_MCF -> SL_MCF_TOO as before in the code)
- In saveload.h put SL_MCF_TOO in the same location as before but this time also increase all enumerations after that by 1)
-- If something goes wrong with your savegame I will not be able to debug it for you.
-- Ofcourse if your bugreport is clear enough and not related to the no_overload patch, I might be able to reproduce it and continue from there to fix it.
Edit: Fixed reporter of broken treeline after loading scenario made with vanilla openttd.