Chill's patchpack v14_7

[Muzzly]

I patched Chill's patchpack with my own patch adding improved towngroth requirements.

Kogut, have you seen this http://www.tt-forums.net/viewtopic.php?t=37158

ChillCore, we all waiting for V9 . Thanks in advanced

Would you be so kind and look at following patches:
1. window state http://bugs.openttd.org/task/3900
2. stop sharing an order http://bugs.openttd.org/task/3711
3. save company info http://www.tt-forums.net/viewtopic.php? ... mpany+info
4. Improved Breakdowns http://www.tt-forums.net/viewtopic.php?t=39518
5. Town growth based on passenger/mails/goods http://www.tt-forums.net/viewtopic.php?t=37158
6. enable/disable Tree growth http://bugs.openttd.org/task/1605
7. Eyecandy http://www.tt-forums.net/viewtopic.php?t=29286

I would really appreciate if you could include some of those patches to later Chill's releases ( if it's not too much work ). Especially the first one is THE one I really need. I am tired of resizing window each time I want to buy a new train

[Kogut]

I patched Chill's patchpack with my own patch adding improved towngroth requirements.

Kogut, have you seen this http://www.tt-forums.net/viewtopic.php?t=37158

Yes but I wanted to make it dependend on food/goods.
And I think there is enough patches already.

[ChillCore]

Would you be so kind and look at following patches:
1. window state http://bugs.openttd.org/task/3900
2. stop sharing an order http://bugs.openttd.org/task/3711
3. save company info viewtopic.php?f=33&t=40457&hilit=company+info
4. Improved Breakdowns viewtopic.php?t=39518
5. Town growth based on passenger/mails/goods viewtopic.php?t=37158
6. enable/disable Tree growth http://bugs.openttd.org/task/1605
7. Eyecandy viewtopic.php?t=29286

1. Please see this topic: http://www.tt-forums.net/viewtopic.php?f=32&t=49406 . If the "how to handle smaller screenresolutions" is solved I might include it.
2. Undecided, as in have not yet tested or looked at the code.
3. I like that patch also. Very likely to be included at some point in time if still functional and mergable with current code.
4. Me likes a lot but I have not yet tested the latest updated version.
5. Kogut has some problems with it ... I have not yet looked as to how mergable it is with the patchpack and if it can be dissabled.
6. Please read the comments near the link you provided as to why it has been rejected for trunk inclusion and use the invisibility settings instead. Also see V9.
7. Really needs a major bump to trunk. Also something like it might appear, at some point in time, in trunk under the form of NewOjects.


Also I have not forgoten about the other request for inclusion. It is not because they are not included now that they will never be.



Anyway without further delay, v9 is attached to this post.
Here is what has been changed:
Some things have already be mentioned but I prefer to repeat them to keep it all in in one place.

Updated:
-------
- Diesel smoke is back, updated to v3_1.
- Panorama screenshot updated to v3. Extended with console command.
- Cargodist to r20274.

Added:
-----
- Watch other company's gui patch.
- Reduced tree growth patch.
- Vehicle leasing.

New files:
---------
- src/watch_gui.cpp
- src/watch_gui.h

Changed:
-------
- r19896 breaks many of my savegames and interferes with my playingstyle.
IMHO the back of a one way signal is not a safe waiting place. Sorry Devs but that is how I feel about it.
I have made it a switch in Advanced Settings->Vehicles->Routing so everybody is happy ...
Default is on. <- As trunk is now.

Fixed:
-----
- Sometimes the refit options can not be selected until the gui is resized. (Kogut)
- Crash when removing the wagons from an engine in the depot while the refit window was open.
- Right click on a station tile in the improved build station gui to show the tooltips did not work properly. (Muzzy)

Todo:
----
- Hover over instead of right-click a station tile in the improved build station gui, for the "old" station tiles it works already.
- Give the measurements tools another shortcut than "R" ... still waiting for suggestions. You can override it in hotkeys.cfg
- Still some code to update to trunk in split refit patch but the patch is functional.

Known bugs:
----------
- Buy land area is removed temporarily as it was broken, However I will try to get it back for the next version.
- In the smallmap linkstats view, NARS gearing ratio shows up us cargo.
- Some Measurement tools inconsistencies when selecting only one tile.
- Measurement tools never show 0 height difference except on first game start.
- Glitch with vehicle near sandpit/gravelpit in FIRS

Known Compiler warnings:
-----------------------
- copypaste.cpp (3, line 514, 549 and 716)
- watch_gui.cpp (2, line 196 and 200)

Additional note:
-----------------
copypaste.grf is now released under the GPL license. Follow the link in the first post to find an updated first post.
Thank you Frostregen for adding the notice.

Next is:
- Updating the second post with new files, new patch, new zip and add add the authors of the included patches.(when done topic title will be changed)
- Checking a few bugs with single patches and update first post with known bugs.
- Playing a bit myself if I can resist toying with the code that is. Moehaahaahaa

Have fun.
And please, please, please no bug reports outside this thread unless reproducable with only the suspect patch applied or clean trunk in case of graphical glitches.


Notice concerning the attached patch:
This version contains a few errors for MSCV100 users and 2 (trunk) bugs. You can find a bumped and fixed patch (v9_1) lower on this page, posted by cheechako, or in the first post.
I will leave it here as a binary has already been posted against this version and the GPL license requires for he source to be available for three years after a binary has been posted.

[Dante123]

do you also have a already build version ?
windows 7 is giving me a pain in the ass to set up a correct compiling environment

[ChillCore]

I have but is is for Ubuntu 9.04 so it is no good for you.
Be patient ... someone might post his win32 version soon enough.

[SirkoZ]

Just a quick reminder - diesel_smoke with _settings again is here.

My sig.

[cheechako]

MSVC++ Express 2010 thinks that all of the additional (not-in-trunk) headers are code files, and bombs with pages of errors. Just changing all the new h/hpp files to headers fixed that, but I did that in the MS GUI and don't know how to make a diff or the project files to indicate this.

However, MSCV gives more warnings than the few posted above as known issues. Mostly these are forcing int to bool or unary minus op on unsigned. I've attached the build log if you're interested. I compiled a clean checkout first before applying the patch, so I know the warnings are not from trunk.

EDIT: Removed old version of binary - see below for current version. Attached patch file is also obsolete, but left here for GPL purposes.

[Kogut]

Kogut has some problems with it (about towngrowth patch) ... I have not yet looked as to how mergable it is with the patchpack and if it can be dissabled.

That patch is unrelated with mine, written from scratch.

[ChillCore]

Just a quick reminder - diesel_smoke with _settings again is here.

Cool will test and update in the next version.
Thank you for the effort.

MSVC++ Express 2010 thinks that all of the additional (not-in-trunk) headers are code files, and bombs with pages of errors. Just changing all the new h/hpp files to headers fixed that, but I did that in the MS GUI and don't know how to make a diff or the project files to indicate this.

Hmm, I would fix it if I knew where and what is wrong, maybe I have to adjust some more files.
As I have no clue for the moment ...

However, MSCV gives more warnings than the few posted above as known issues. Mostly these are forcing int to bool or unary minus op on unsigned. I've attached the build log if you're interested. I compiled a clean checkout first before applying the patch, so I know the warnings are not from trunk.

I am very much interested in the build log. Thank you for providing it.
- The warnings in viewport cpp come from the moreheightlevels patch. It is easily fixed if I go back to using numbers. 64 instead of ((GetMaxTileHeight() + 1) / 4). I will have a looksie while updating the more height levels patch to current trunk.
- The warnings in copypaste.cpp are from the copypaste patch. They have been reported already. Except for the first 1 I think, will check my post made in the thread earlier.
- The others warnings seem to come from the leasing patch if I am not mistaking. I will also report them but first I have to check the line numbers in that patch as they do not correspond with line numbers in my patchpack.

Thank you for the build and the build.log, much appreciated.

Kogut has some problems with it (about towngrowth patch) ... I have not yet looked as to how mergable it is with the patchpack and if it can be dissabled.

That patch is unrelated with mine, written from scratch.

Sorry for the misunderstanding.
If you want you may PM me the diff of your extended patch so I can have a looksie.
Maybe you forgot something while merging it against the town ratings label patch and that causes the difference between the town label and the town info gui.

[Dante123]

Crash/Bug report:

R_01.PNG (258.59 KiB) Viewed 1257 times

game crashes when you build a busstop on empty land.
this also happens when there are no GRF files are loaded.

used the compile from "cheechako" that is 2 posts above this one.

[ChillCore]

Correct.
It was fixed in trunk r20357, seems like I released v9 a revision or two to early as r20358 is also a bugfix.
I have bumped the patch to current trunk.
Diesel smoke is not yet updated as it would break the savegames made with v9.

Edit:
I have removed the patch as it was still buggy for MSVC100 users.
Please find the fixed patch for v9_1 below, posted by cheechako, or in the first post.

[Dante123]

someone would do the honor of compiling it for win ?

[cheechako]

As far as I can tell, MSVC 2010 stores the tiny by critical file property (header or code) in the vcxproj and vcxproj.filters files. I checked this by downloading trunk and changing one of the existing headers to a code file.

The current patch pack diff changes the “filters” file correctly, but most (all?) of the not-in-trunk header files are incorrect in openttd_vs100.vcxproj. For example:

<ClCompile Include="..\src\copy_paste.h" />

should be…

<ClInclude Include="..\src\copy_paste.h" />

So I modified the 20356 diff file as indicated above, changing the incorrect .h and .hpp files, and then applied it to a clean r20356. It compiled without errors, although it still had the warnings already posted in the build log.

Unfortunately, I cannot compile trunk 20362. It fails with errors in two files related to the MS SDK. I tried to compile without DirectX music support and still had no luck. I’ll try to track that bug down for the main devs.

I’ve attached the older modified diff in case someone wants to compile with MSVC. There is no point on attaching the 20362 diff. ChillCore can find the fixes in the notes above and the older diff. Of course, if any new patches are added to the pack, the same changes would have to be checked for/made for any header files.

To emphasize: this is NOT the current patch diff. This is v9 and not v9.1.

[cheechako]

Stupid mistake on my part, though I’m not sure what mistake I made. Probably forgot a semi-colon when I added the DirectX SDK. It turns out that r20362 compiles fine, and my modifications to the diff relating to the header files and MSVC 2010 works too.

So, here’s the v9.1 Windows binary along with the fixed patch file. The only changes in my diff vs. the original affect the projects/openttd_vs100.vcxproj file.

[ChillCore]

Hi cheechako,
I was just about to post a fixed patch but I see you have already done so.
Thank you for finding the error I made. I was "copy-paste coding" and did not pay enough attention it seems.

Would you mind removing the binary and patch for v9 you have posted above as they contain a few bugs in trunk.
I will remove my, buggy for MSVC100, v9_1 patch and also make a notice near the v9 patch that it is buggy for future reference but I will leave it there as that is required by the license since a binary has been posted, even if it is removed afterwards.

Furthermore I will update the first post with a link to your binary and v9_2 which is basically v9_1 but with a few more corrections. Read below.

If you look in your patch for v9_1 you will see that I have made a few more errors, see the linkgraph\files and core\multimap.hpp in projects/openttd_vs100.vcxproj.filters.
In your patch and my previous patches, the lines read, eg. "core/multimap.hpp" while it should be "core\multimap.hpp". These errors do not seem to cause problems (Do they?) so no need for another binary yet. Read below.


In other news ... another patch, besides the diesel smoke patch, has been updated ... a "bit" discretely. A cookie for he who finds it .
The next version is in the making.
There goes my: "Me playing for a while" ... Oh well, I'll play with the next version.

[JGR]

In other news ... another patch, besides the diesel smoke patch, has been updated ... a "bit" discretely. A cookie for he who finds it .

Without diffing the diffs, is it the signals on bridges/tunnels removal bug?

When a more stable binary comes out I'll give it a go (especially if the savegame format hasn't been bumped).

[ChillCore]

You win.

I have not yet looked at the code so I can make no promises about bumping the savegameformat but as the patch is already included in the patchpack and if no additional savegame code is added It should be possible to update it without breaking your savegame.
However if I update the more diesel smoke patch savegames will brake as that patch did not contain savegame code before.
I can always do it in two steps.
First v9_x with the signal in tunnels/bridges patch updated and then later v10 with the more diesel smoke patch (and maybe a few others after getting v9_x to a more stable state).

[cheechako]

OK, removed the first binary I posted, but left the patch file with a note. Left my recent post as-is with the binary and patch file.

I didn't have any complaints from the reversed slashes, so I never noticed them. Generally, Windows takes them either way, but I'll watch for that in the next patch. Since it compiles into a valid executable, I see no reason to bump the patch now.

[Eddi]

If you look in your patch for v9_1 you will see that I have made a few more errors, see the linkgraph\files and core\multimap.hpp in projects/openttd_vs100.vcxproj.filters.
In your patch and my previous patches, the lines read, eg. "core/multimap.hpp" while it should be "core\multimap.hpp". These errors do not seem to cause problems (Do they?) so no need for another binary yet. Read below.

err... i suggest you use projects/generate instead of editing these files manually. source.list is the "master" file that should be edited.

[ChillCore]

err... i suggest you use projects/generate instead of editing these files manually. source.list is the "master" file that should be edited.

Gladly, but how?
I mean what is the command for that and where can I find more info on additional commands.
(If the command is "projects/generate" I will feel soooooooo stupid ... tell me it is not.)

On a side note, changing manually means knowing what has changed but that is besides the point.