[Patchpack] r24122 + some patches v0.04a

[handrake]

Motivation
I wanted to enjoy all the features in the trunk with some awesome patches, so I took some time to create this patchpack. Thanks to all the OpenTTD developers and patch writers.

Download
Please download the binary and diff file from here. Alternatively, you can clone the project repository if that's what you'd prefer. All bugs should be reported as a reply to this post or even better as an issue to the project site. Please don't report bugs from this patchpack directly to Flyspray.

Because I don't personally play in MP, I have no guarantee this patchpack will always behave as expected, but there shouldn't be too many issues if server/clients all use this patchpack.

Any comments/suggestions are appreciated.

Changelog

• Version 0.04a released
  • Fixed cloning-vehicle-crash bug. Thanks to Juanjo for a quick fix.
• Version 0.04 released
  • Updated to r24122.
  • Added Polyline track building tool
  • Added Group GUI
  • Fixed so that separation function doesn't override start date.
• Version 0.03 released
  • Added Supply and demand volume display
  • Added Chunnel
  • Added Rating in Town Label
  • Added Extra-large maps
• Version 0.02c released
  • Updated to Template based train replacement r24093 v0.4c
  • Removed Another Daylength patch as it requires a more careful approach for inclusion
• Version 0.02b released
  • Added Another Daylength patch
  • Updated to Template based train replacement r24093 v0.4b
  • Added Mac binary.
• Version 0.01 released

Patches in order of inclusion

• Multi-tile land purchase (by handrake)
• Departure boards (by hthhs)
• Slim Timetable Separation (by AndiK)
• Cargo Distribution (by fonso)
• Signals in tunnels and on bridges V3.02 (by HackaLittleBit)
• Template based train replacement v0.4b (by ffpp)
• Supply and demand volume display (by handrake)
• Chunnel (by HackaLittleBit)
• Rating in Town Label (by Terkhen)
• Extra-large maps (by Bilbo)
• Polyline track building tool (by adf88)
• Group GUI (by Juanjo)

To-do

• Station acceptance conditional order - if station x accepts y, go to x.
• Add Improved breakdowns
• Add Town cargo generation factor patch

[MJS]

Nice work, thanks!

[ffpp]

Hi handrake,

thanks for including me and good effort overall. I really like having CargoDist coupled with a separation patch.
I'm planning on releasing a newer version of my patch the next few days, including a whole bunch of improvements.

Are you going to maintain this project in the future ?

[bremerjoe]

This looks like a very nice small patch collection. I have to admit that I do not like playing without some Cargo Distribution patch and as I have no idea about coding or even compiling I have to wait for people to publish nice precompiled patches. So thanks for publishing this one. Will try it out and it seems to be best suited for me as long as CPP gets updated to current trunk.

[handrake]

Are you going to maintain this project in the future ?

I do intend to do that, but again, iff time permits

[Lordmwa]

Thanks A LOT, my own attempts were not working too well.....

[FLHerne]

As above, thanks . I was trying to do something similar, but didn't have enough experience with C++ to solve the various conflicts. Now I can use more recent GRFs .

[Lordmwa]

If you were planning to update this the only other patch that i would strongly reccomend is a daylength patch im amazed how fast time goes without it!

[handrake]

If you were planning to update this the only other patch that i would strongly reccomend is a daylength patch im amazed how fast time goes without it!

I've looked at it but that patch is kind of old (6000 revisions!). I'll have a go at it in a few days. But again, no guarantees

[handrake]

Updated to r24093 and included day length patch. (See first post)

[Supercheese]

Awesome! Gonna use this for the game I just started.
More detailed feedback to come.

[ffpp]

Suggestion: improved breakdowns patch
Though, I don't know how much work it takes to include it, I think it is out of maintenance for a while now.

Thanks for stitching it all together.

[lostwizard]

Let me start by saying, good job on the patch set so far.

I just tried applying version 0.02b to trunk r24093. It failed on src/station_gui.cpp and src/timetable_gui.cpp. It's not clear why though I can see the reject files show what appears to be a complete replacement of the files failing.

I'm running this on a linux system but that should not prevent things from working.

[handrake]

Let me start by saying, good job on the patch set so far.

I just tried applying version 0.02b to trunk r24093. It failed on src/station_gui.cpp and src/timetable_gui.cpp. It's not clear why though I can see the reject files show what appears to be a complete replacement of the files failing.

I'm running this on a linux system but that should not prevent things from working.

Try deleting those two files. It may be the case where they exist but are untracked, thus preventing new files from getting generated. Alternatively, you can pull from my repo directly. It's probably easier that way.

[lostwizard]

Try deleting those two files. It may be the case where they exist but untracked, thus preventing new files being generated. Alternatively, you can pull from my repo directly. It's probably easier that way.

Yeah, I had the same thought. I pulled the repo and set about building. It failed with

Code: Select all

...../src/aaa_template_vehicle_func.cpp:69:202: error: cast from ‘const Train*’ to ‘uint32 {aka unsigned int}’ loses precision

(and several other instances of the same error for other pointers)

Looks there is a problem with the code on 64 bit systems. It's dubious to cast a pointer to uint32 in general but it is certainly incorrect on 64 bit platforms. I'd be happy to help you further with this over email or private messaging (to save spamming the forum with it).

[ffpp]

Try deleting those two files. It may be the case where they exist but untracked, thus preventing new files being generated. Alternatively, you can pull from my repo directly. It's probably easier that way.

Yeah, I had the same thought. I pulled the repo and set about building. It failed with

Code: Select all

...../src/aaa_template_vehicle_func.cpp:69:202: error: cast from ‘const Train*’ to ‘uint32 {aka unsigned int}’ loses precision

(and several other instances of the same error for other pointers)

Looks there is a problem with the code on 64 bit systems. It's dubious to cast a pointer to uint32 in general but it is certainly incorrect on 64 bit platforms. I'd be happy to help you further with this over email or private messaging (to save spamming the forum with it).

Funny, this is from my patch and I looked into the piece of code pointed to by your error.
It is a little printf wrapper function where I didn't care for clean code because I use it only for development, not in the actual game and would have removed it later anyways, when developing the patch is finished.
I would be good if you could post or send me a list of all instances where this happens. Then I can see if it's really only those helper functions or if I have some unclean code somewhere else too.

[handrake]

Try deleting those two files. It may be the case where they exist but untracked, thus preventing new files being generated. Alternatively, you can pull from my repo directly. It's probably easier that way.

Yeah, I had the same thought. I pulled the repo and set about building. It failed with

Code: Select all

...../src/aaa_template_vehicle_func.cpp:69:202: error: cast from ‘const Train*’ to ‘uint32 {aka unsigned int}’ loses precision

(and several other instances of the same error for other pointers)

Looks there is a problem with the code on 64 bit systems. It's dubious to cast a pointer to uint32 in general but it is certainly incorrect on 64 bit platforms. I'd be happy to help you further with this over email or private messaging (to save spamming the forum with it).

Funny, this is from my patch and I looked into the piece of code pointed to by your error.
It is a little printf wrapper function where I didn't care for clean code because I use it only for development, not in the actual game and would have removed it later anyways, when developing the patch is finished.
I would be good if you could post or send me a list of all instances where this happens. Then I can see if it's really only those helper functions or if I have some unclean code somewhere else too.

I just got rid of all the printfs in that file and everything was fine.

[lugo]

is the version on your site for 32-bit or 64-bit systems? (openttd-handrake-patchpack-r24093-v0.02b.zip)

edit: thanks for your efforts btw!

[handrake]

is the version on your site for 32-bit or 64-bit systems? (openttd-handrake-patchpack-r24093-v0.02b.zip)

edit: thanks for your efforts btw!

32-bit

[AndiK]

Downloading right now. I've been working on a smallish patch pack for a few friends and myself, but yours renders mine quite redundant. Thanks for the effort (and for giving my patch a chance in a pack ^_^).