skidd13 wrote:

Did a few renamings,rearrangements and rewrites. Hope you like it.

Attachments

• make_town_cmd_a_bit_more_readable_basics.diff (8.33 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment1981

skidd13 wrote:

Did some further work on the basic stuff.

Attachments

• make_town_cmd_a_bit_more_readable_basics.diff (12.04 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment1988

skidd13 wrote:

So further suff is now at the patch. Now I need to move the int to DiagDir. Hope it's now better possible.
Fully rewritten IsNeighborRoadTile. Should increase performance.

Attachments

• make_town_cmd_a_bit_more_readable.diff (15.14 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment1991

skidd13 wrote:

This time I moved some subcode to functions. Converting the town growth to a abstract class in mind.

A side note the Functions to handle the TownGrowth directions are temporary.

My plans so far ATM:

1. Convert the int dir (dir is pos of the set bit in the planded roadbits) to a more native dir (DiagDir). I hope the code gets more readable then.
2. Convert the whole stuff to an abstract class where the growth is implementated diffrent for each layout (with growth I'm talking of "is this a nice tile to plant a road" and "which roadbits we want to plant here") The implementation of the target-tile algorithm (on which side the town grows further) will remain in the main class.

Point 2 needs some further thinking where to initiate the object and if we want to have one object for each town or one for each algorithm or one for all towns.

Attachments

• make_town_cmd_a_bit_more_readable_r10995.patch (17.23 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment1993

skidd13 wrote:

Split off of the IsNeighborRoadTile optimisation. Another few "outsourced" parts will follow.

Attachments

• improved_IsNeighborRoadTile.patch (2.79 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment1997

skidd13 wrote:

So next one is here: town bridge check and creation

Attachments

• improved_bridge_algorithm_r11012.patch (3.22 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2005

skidd13 wrote:

Update (cause of r11015)

Attachments

• improved_bridge_algorithm_r11015.patch (2.88 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2008

skidd13 wrote:

Simplyfied the improved_IsNeighborRoadTile.patch

Attachments

• improved_IsNeighborRoadTile_r11029.patch (3.02 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2018

skidd13 wrote:

So part one is more or less done! :D
There is the need of optimisation now. But this should now be a smaller problem cause the code is more human readable now.

Patch should apply against 11039.

Attachments

• town_growth_rewrite_1st_part.patch (14.86 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2039

skidd13 wrote:

Oops I forgot to say that I'd like to hear some comments.
Optimisation proposals are very welcome.

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2040

skidd13 wrote:

1st Update of part1. Mainly optimisations and cleanup.

Attachments

• town_growth_rewrite_1st_part_optimised.patch (17.79 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2047

skidd13 wrote:

Updated comments and a missing NOT.

Attachments

• town_growth_rewrite_part1_r11042.patch (21.01 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2055

skidd13 wrote:

I thought a bit over the change to the TownGrowth object.
I made 2 graphs to see how the whole stuff is working ATM and will work as Object.

Attachments

• current_tg.pdf (7.24 KiB)
• oop_tg.pdf (5.39 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2056

skidd13 wrote:

Added a nicer solution for the grid algorithm. #1207 should be solved partialy.

Attachments

• town_growth_rewrite_part1_r11050.patch (22.23 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2078

skidd13 wrote:

Sorry! Fixed some conditions that could cause the stop of town growth.

Attachments

• town_rewrite_r11069.patch (22.39 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2095

skidd13 wrote:

I noticed a bug of the current trunk and it appears also with my current patch applyed.
In the attached scenario there is a sign which marks a tile.
If you place a small town there it stops to grow immediately.
I'm working on it.

Attachments

• UNNAMED.scn (26.78 KiB)
• town_rewrite_r11069.patch (23.09 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2096

Rubidium wrote:

You changed the maximum length of bridges by one (or rather, it tries to build a bridge one more time)
for (int i = -11; ++i != 0;) is not the same as for (int i = 0; i++ > 11;)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2097

skidd13 wrote:

oops, thanks for the annotation.

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2098

skidd13 wrote:

So fixed the bridge thing.

Attachments

• town_rewrite_r11072.patch (23.05 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2099

skidd13 wrote:

This should be the final version of part1.

Attachments

• town_rewrite_r11089.patch (23.13 KiB)

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161#comment2111

Belugas closed the ticket.

Reason for closing: Implemented

r11091 now bears the code you've patiently built.
Thanks

This comment was imported from FlySpray: https://bugs.openttd.org/task/1161