Welcome, Guest

Welcome to the BTPro OpenTTD Community

This community was build around the game: OpenTTD
OpenTTD is an (Free) open source simulation game based upon Transport Tycoon Deluxe

!!! Please note that a few servers have been shut-down !!!
Most of the times these servers were doing nothing (no players),
that's why I've decided to slim down the number of OpenTTD servers running.

I have made a selection to keep the most popular servers online.
If you miss a OpenTTD server that you REALLY played a lot, please do post
in the forums. I will then check if I can get it back online!

I'm trying to work from now on with only 1 physical server to
run all OpenTTD instances!

The following servers have been shut down recently:

1, 2, 6, 7, 9, 10, 11, 12, 13, 15 & 18

Frank

Please take a look at BTPro's VIP Membership

BTPro VIP Membership Logo

Please click here for more information or to sign-up.

Screenshot created 27 Minutes ago on server:-BTPro.nl- #29 - CITYBUILDER APHID's Arctic - 6000pop|WINTER|1990-GOAL:

Make sure to download the newest version of the BTPro OpenTTD Client from the "BTPro OpenTTD Client Talk" Forum!

!!! BTPro Client Latest Update: the 27th of September 2023 !!!
!!! Current OpenTTD Version: 13.4 !!!

Goto the "BTPro OpenTTD Client Talk" forum to download the client and leave a message if it's working for you

Currently we have 4 Server Operators:

Frank, ST2, Wacko1976, Inscius!

We are badly looking for moderators!

Want to be part of the team?! Want to help?! Read below...

NOTE:
Admins will act on the basis that ALL players know the game and it's mechanics.
We think that no one goes to an online game without first some practice and know how to play it.
Companies without registered nicknames (as shown in Client List) on it, can be reset without warning!
To learn OpenTTD mechanics, there is a forum/wiki and... a Single Player mode!!
Practice before playing on BTPro, and if you decide to start, READ THE RULES first.

If you wish to become part of the BTPro Server Operator family, ensuring that the rules are upheld with fairly and justly,
the willingness to teach new players on how to play the game and to make sure BTPro is one of the most relaxed,
entertaining servers out there for OpenTTD then apply in the Moderator Applications section below!

Also do not hesitate to ask us a question in the forums or when you see us online on one of the servers!

Happy Gaming!

BTPro OpenTTD Client

BTPro OpenTTD Client Talk

How to apply patch to sourcode? (Linux)

Page:
1

TOPIC:

How to apply patch to sourcode? (Linux) 5 years 11 months ago #6641

Hi, I've been compiling OpenTTD from the sources with each OpenTTD version for few years now and each time I used:
patch -p0 -i Diff.file

but now it doesn't seem to work any more.

It gives the following output:

au@howth:~/tmp/openttd-1.8.0$ patch -p0 -i BTPro_Client_1.8.0_B_180002_git.diff 
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/projects/generate_vs100.vcxproj b/projects/generate_vs100.vcxproj
|index 4417308..84f8f59 100644
|--- a/projects/generate_vs100.vcxproj
|+++ b/projects/generate_vs100.vcxproj
--------------------------
File to patch:

There have been obviously some changes with OpenTTD development being moved to Git. But so far I didn't find out how to apply BTPro Client patch. Any idea? I also tried "git apply" but it gives the following:

au@howth:~/tmp/openttd-1.8.0$ git apply BTPro_Client_1.8.0_B_180002_git.diff
BTPro_Client_1.8.0_B_180002_git.diff:583: trailing whitespace.
/* 
BTPro_Client_1.8.0_B_180002_git.diff:614: trailing whitespace.
static const std::string base64_chars = 
BTPro_Client_1.8.0_B_180002_git.diff:985: trailing whitespace.
			NWidget(WWT_EMPTY, COLOUR_GREY, WID_CT_INCOME),SetMinimalSize(108, 0),SetFill(1, 0), SetPadding(2,2,2,2), SetResize(1, 1),		
BTPro_Client_1.8.0_B_180002_git.diff:1164: trailing whitespace.
			case NIC_TOKEN_WEBSITE:	
BTPro_Client_1.8.0_B_180002_git.diff:1168: trailing whitespace.
			case NIC_TOKEN_WIKI:	
error: patch failed: projects/settingsgen_vs100.vcxproj:1
error: projects/settingsgen_vs100.vcxproj: patch does not apply

au
Topic Author
Offline
Junior Member
Posts: 35
Thank you received: 2

Please Log in or Create an account to join the conversation.

Last edit: by au.

How to apply patch to sourcode? (Linux) 5 years 11 months ago #6642

I figured it out, the command is: git apply --stat BTPro_Client_1.8.0_B_180002_git.diff The following user(s) said Thank You: ST2, tomb	au Topic Author Offline Junior Member Posts: 35 Thank you received: 2
Please Log in or Create an account to join the conversation.

How to apply patch to sourcode? (Linux) 5 years 11 months ago #6643

glad you figured it out. I was to suggest patch -p1 < file.diff but never tested it ^^ Enjoy the games	ST2 Offline Administrator Posts: 1222 Thank you received: 628
Please Log in or Create an account to join the conversation.

How to apply patch to sourcode? (Linux) 5 years 9 months ago #6693

au wrote: I figured it out, the command is:
git apply --stat BTPro_Client_1.8.0_B_180002_git.diff

That doesn't actually apply the patch for me. It in fact changes no files for me.

Instead I do this:

patch -p1 < BTPro_Client_1.8.0_B_180002_git.diff || true

The "|| true" is because one file fails to apply, however that is a VS file and we don't need VS on linux so it doesn't matter.

The following user(s) said Thank You: Frank, au

gentz
Offline
New Member
Posts: 6
Thank you received: 6

Please Log in or Create an account to join the conversation.

Last edit: by gentz.

Page:
1

BTPro OpenTTD Client

BTPro OpenTTD Client Talk

How to apply patch to sourcode? (Linux)

Time to create page: 0.071 seconds

Best hosting deal on hostgator coupon or play poker on party poker