Community Integrated Version Build 1 (Test & Bug Fix)

[wleader]

What do you think about save compatibility? (Edit: just read in the other topic, thx.)

Edit: I think, the CIV would be worth to have a wiki page: http://wiki.openttd.org/index.php/CIV

I replied in the main thread.

[wleader]

Ladies and Gentlemen,

Here it is the first build of all TWENTY the timely submitted patches. Now, expect there to be some bugs so I think we ought to go into a bug fixing mode for a little while before we call it a final and start on Build 2.

So In no particular order, the patches contained in this build are as follows:

• Random Road Construction
• Traffic Lights
• Menu Jumping
• Better Graphs
• Minimum Distance
• Max Subsidy Distance
• Town Bridge Building
• Town Growth Needs Goods
• More Realistic Loans
• Filter By Cargo
• Distant Join Stations
• Move Clients
• Password Arguments
• Max Year
• In Game Rivers
• YAPP 6.2
• Day Length
• Flags In Client List
• Limit Road Vehicle Speed
• Track Sharing

If someone wants to post a build for other operating systems, then please do. Windows users should be able to test the build by extracting the zip archive over a working install of 6.0 or a Recent nightly.

Edit: New windows binary that is compatible with Ammler's Dedicated server.

[Ammler]

I would suggest to use a special revision name for compiling like
--revision=r12868-CIV1

Patch applied with one error, many warnings while compiling, but it seems to work.
(see my log)

I will start a server and check that too...

Windows users should be able to test the build by extracting the zip archive over a working install of 6.0 or a Recent nightly.

Are you sure, thats needed?

EDIT:
Server is up:

join irc://irc.oftc.net/openttdcoop.dev
(Because of desyncs with CIV1, we testing a patchpack from yorick right now...)

[sickie]

Ammler, I love you! Thank you for the GNU/Linux build. It's the first time I see a patchpack that offers a lin build. I won't be needing to run this patch pack through wine and be called a lamer by devs on IRC :>. Again, thank you!

[Ammler]

Ammler, I love you!

My IBAN: CH06 0483 5094 3345 8000 0

Most time, it's assumed, that Linux user build their own builds.

Greets
Ammler

[wleader]

I would suggest to use a special revision name for compiling like
--revision=r12868-CIV1

I had used CIVr12868, but since you used something slightly different, the two builds won't shake hands for network play. Since you are willing to run a dedicated server, I can update the windows build to match version names.

Patch applied with one error, many warnings while compiling, but it seems to work.
(see my log)

A quick look makes it look like most of it is Unix vs Windows line wrapping. I should probably take a closer look to see if any of my patches are causing warnings. I would recommend other submitters do the same to make sure their patches don't cause warnings.

Windows users should be able to test the build by extracting the zip archive over a working install of 6.0 or a Recent nightly.

Are you sure, thats needed?

The program still uses some copyrighted grf files from the original TTD. Overwriting a working install makes sure that the user has the files I am not allowed to distribute.

[Ammler]

The loan system doesn't work here.

Edit: and desyncs (can every patch submitter approve his patch as MP save?)

[PhilSophus]

The loan system doesn't work here.

A bit more specific error description would have been helpful, but after patching, compiling and trying it myself I see the problem. Very strange. A quick first look at my patch didn't reveal the problem, so I'll have a deeper look tomorrow.

[jaybud4]

Holy hell.
This is sweet.
Maybe you should check out Gonozal's pack and add some of the patches from there? (With permission of original author, of course)
http://www.tt-forums.net/viewtopic.php?f=33&t=36127
(Considering that he doesn't seem to be updating it anymore, unfortunately)

[Vikthor]

jaybud4 before you make such suggestion read how is this CIV managed. Wleader won't be adding anything on his own, patch must be submitted by maintainer. And by the way, at least three patches form Gonozal's pack are already in.

[sickie]

Well, Ammler, my love :> you forgot to include trafficlights.grf. If an author submits a patch wouldn't it be great to include the grfs that a patch need? Fot the sake of completness. If it's a license problem, than you should only include patches that depends on GPL compatible GRFs, so that the community integrated version is freely distributable without the hurdle to hunt for additional files. It's a burden enough the need for TTD's GRFs.

[sickie]

Bug report. I am useing Ammler's build and I can't use Finances windows (can't click buttons) until I make it smaller, than I can use it.

[sulai]

Many authors don't update their patch threads, and I would like to have up to date files of some patches.

wleader, I would like you to provide each separate patch as single .diff files too (if the authors allow you to). Maybe put CIV1_r12868.patch into a zip file and additionally all single patch files as well?

Edit: just realized that all up to date patches are in this thread already ^^

[Roujin]

Many authors don't update their patch threads, and I would like to have up to date files of some patches.

wleader, I would like you to provide each separate patch as single .diff files too (if the authors allow you to). Maybe put CIV1_r12868.patch into a zip file and additionally all single patch files as well?

maintaining your own patch is a requirement to get it included in the Community Integrated Version. If I want my traffic lights patch in CIV 2, I will have to update it (which I will do), as anyone else with their according patches.

[PhilSophus]

Okay, this patch fixes the bug reported by Ammler and sickie (finances window being one line too small so that loan buttons weren't accessible). Sorry for inconvenience due to this bug.

CIV1_r12868_incremental_fix.patch is meant to be applied to the source already containing CIV1_r12868.patch with patch -p1.

CIV1_r12868_fix1.patch is the complete CIV1 patch generated with "svn diff" with my fix included. Please apply to a clean r12868 with patch -p0, TurtoiseSVN, BuildOTTD or your preferred patch utility.


@wleader: Could you please remove the buggy version (either replacing by my version or putting a pointer to this post).

[sulai]

Another bug in YAPP: If trains crash, some tracks are highlighted. This is okay. But if they are removed, the tracks stay highlighted and no train may pass. Until you rebuild these track tiles.

[Ammler]

PhilSophus, I am not able to apply your patch as it is. The incremental one has false base. (CIV1.sav/...)

It does, compile now...

We still have the desync issue to find. We like to have a MP safe CIV, won't we?

Greets
Ammler

[Vikthor]

Ammler did you read PhilSophus post, especially the bit about applying with -p1?

[Rubidium]

Edit: and desyncs (can every patch submitter approve his patch as MP save?)

Approve in the signed contract kind?

[Ammler]

Edit: and desyncs (can every patch submitter approve his patch as MP save?)

Approve in the signed contract kind?

I meant confirm...

I deactivated the sharing patch and it seems to work now.... (But that patch makes most sense with MP)

Greets Ammler