Re: [Patch] Daylength, Cargodist with sprinkles
Posted: 10 Feb 2010 21:30
Is it possible to merge more height level patch with cargodist++?
The place to talk about Transport Tycoon
https://www.tt-forums.net/
As Eddi said, with a little luck, yes. But I'm not going to try it myself. Pulling autosep into these builds was a little risky already, and I'm very uncomfortable with pulling in any more random patches.Kogut wrote:Is it possible to merge more height level patch with cargodist++?
As usual, no savegame compatibility
Code: Select all
line 4611 SLE_CONDREF(Vehicle, ahead_separation, REF_VEHICLE, 138, SL_MAX_VERSION),
line 4612 SLE_CONDREF(Vehicle, behind_separation, REF_VEHICLE, 138, SL_MAX_VERSION),
line 4621 SLE_CONDVAR(Vehicle, current_loading_time, SLE_UINT32, 135, SL_MAX_VERSION),
line 8062 SDT_CONDVAR(GameSettings, economy.town_cargo_factor, SLE_INT8, 133, SL_MAX_VERSION, 0, 0, 0, -16, +8, 1, STR_CONFIG_SETTING_TOWN_CARGO_FACTOR, NULL),
line 8070 SDT_CONDBOOL(GameSettings, order.timetable_automated, 67, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_TIMETABLE_AUTOMATED, NULL),
line 8071 SDT_CONDBOOL(GameSettings, order.timetable_separation, 67, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_TIMETABLE_SEPARATION, NULL),
Code: Select all
line 8060 SDTG_CONDVAR("daylength_factor", SLE_UINT8, 0, 0, _date_daylength_factor, 1, 1, 255, 1, STR_CONFIG_SETTING_DAYLENGTH_FACTOR, NULL, 133, SL_MAX_VERSION),
Code: Select all
SDTG_CONDVAR("daylength_factor", SLE_UINT8, 139, SL_MAX_VERSION, _date_daylength_factor, 1, 1, 255, 1, STR_CONFIG_SETTING_DAYLENGTH_FACTOR, NULL),
Code: Select all
line 8052 SDTC_CONDOMANY( gui.autosave, SLE_UINT8, 23, SL_MAX_VERSION, S, 0, 3, 6, _autosave_interval, STR_NULL, NULL),
Code: Select all
line 8052 SDTC_CONDOMANY( gui.autosave, SLE_UINT8, 23, 138, S, 0, 1, 4, _autosave_interval, STR_NULL, NULL),
line 8053 SDTC_CONDOMANY( gui.autosave, SLE_UINT8, 139 , SL_MAX_VERSION, S, 0, 3, 6, _autosave_interval, STR_NULL, NULL),
Code: Select all
SDTC_OMANY(gui.autosave, SLE_UINT8, S, 0, 3, 6, _autosave_interval, STR_NULL, NULL),
It does if you use [ code ] tags (without the spaces), like this:ChillCore wrote:Sorry for the messed up coding style but the forum does not allow double spaces(autoreduced to one) and using codeblocks would be table braking.
Code: Select all
SLE_CONDREF(Vehicle, ahead_separation, REF_VEHICLE, 138, SL_MAX_VERSION),
I wrote it, and it's fully intentional. Note that it's an SDTG_CONDVAR - the arguments to the macro are in a different order. How good a choice this is is questionable, but it saved me from a lot of #include ordering pain.ChillCore wrote:If this line was like that in the daylenght patch you used you really, really should report it there as to me that looks like a major booboo.
You're right, I really should be fixing these for compatibility up from trunk, at least.ChillCore wrote:Change numbers just before SL_MAX_VERSION to 139 or higher(trunk is at 138) for all of the above lines.As usual, no savegame compatibility
I did not know about the different order. I rest my case.SpComb wrote:I wrote it, and it's fully intentional. Note that it's an SDTG_CONDVAR - the arguments to the macro are in a different order. How good a choice this is is questionable, but it saved me from a lot of #include ordering pain.ChillCore wrote: If this line was like that in the daylenght patch you used you really, really should report it there as to me that looks like a major booboo.
With the moreheightlevels patch I bumped all values to 200/201 to save me the hassle.SpComb wrote:You're right, I really should be fixing these for compatibility up from trunk, at least.ChillCore wrote:Change numbers just before SL_MAX_VERSION to 139 or higher(trunk is at 138) for all of the above lines.SpComb wrote: As usual, no savegame compatibility![]()
SpComb wrote: As usual, no savegame compatibility
Crash reports / feedback:
Please report any and all crashes from this build in this thread. It's a good idea to also post the crash.* files that OpenTTD produces, along with any relevant information relating to the crash (such as a recent savegame and a description of the circumstances of the crash).
Additionally, comments or suggestions as to the behavior of the auto-separation patch should go into the Automated timetables and separation topic.
Thanks SpComb!Crash reports / feedback:
Please report any and all crashes from this build in this thread, unless you can also reproduce them in a nightly or cargodist/autosep build.
It's a good idea to also post the crash.* files that OpenTTD produces, along with any relevant information relating to the crash (such as a recent savegame and a description of the circumstances of the crash).
Additionally, comments or suggestions as to the behavior of the auto-separation patch should go into the Automated timetables and separation topic.
Tried to change a road to one-way but then OpenTTD crashed on me: it's reproducible every time. It doesn't happen when building a new (one-way) road.SpComb wrote:Crash reports / feedback:
Please report any and all crashes from this build in this thread, unless you can also reproduce them in a nightly or cargodist/autosep build.
It's a good idea to also post the crash.* files that OpenTTD produces, along with any relevant information relating to the crash (such as a recent savegame and a description of the circumstances of the crash).
Additionally, comments or suggestions as to the behavior of the auto-separation patch should go into the Automated timetables and separation topic.
Thanks. I'll have to take a better look at this later; the assertion itself is very generic, so I can't tell very much from it. It might be fixed in a newer trunk revision; I somewhat doubt that any of these patches affect the road code directly.bokkie wrote:Tried to change a road to one-way but then OpenTTD crashed on me: it's reproducible every time. It doesn't happen when building a new (one-way) road.
Which busses are you talking about? I had a quick look at your savegame (had some missing AIs and grf's) but couldn't spot any obvious bugs. Sometimes the difference in starting date seemed off but if I stopped other traffic or removed busses it seemed ok again. It might just be that traffic often makes the travel-times so random that this difference fluctuates?bokkie wrote:EDIT: also, seperation works strangely... on a route taking 93 days, with 3 busses the difference in starting date is 15 days (should be 23). With 6 busses, it's about 14 (should be 13, which is about right). And when selling busses until there are 2, the difference in starting date is 5 (should be 54, route now takes 109 days) even after FF-ing a few years.
Building a one-way road on on a town-owned road crashed in vanilla trunk r19387 (while trying to display the town's manager-face in the resulting error message, no less).bokkie wrote:Tried to change a road to one-way but then OpenTTD crashed on me: it's reproducible every time. It doesn't happen when building a new (one-way) road.
Crash reports / feedback:
Please report any and all crashes from this build in this thread, unless you can also reproduce them in a nightly or cargodist/autosep build.
It's a good idea to also post the crash.* files that OpenTTD produces, along with any relevant information relating to the crash (such as a recent savegame and a description of the circumstances of the crash).
Additionally, comments or suggestions as to the behavior of the auto-separation patch should go into the Automated timetables and separation topic.