Terkhen's Personal Patch Pack

Forum for technical discussions regarding development. If you have a general suggestion, problem or comment, please use one of the other forums.

Moderator: OpenTTD Developers

finesse
Engineer
Engineer
Posts: 24
Joined: 07 Aug 2007 21:10

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by finesse »

Terkhen wrote:As long as there are no conflicts, it can apply to any revision. This means that you probably can apply the diff file to revisions before and after r18353 until you reach the first reject. But the diff was made against r18353, and that is the only revision guaranteed to work with the diff file.
Aha, it seems I was under the miss guided impression that people based PP's off of nightly revisions.. never mind me.

Thanks for the patch pack nonetheless.
Image
Currently running: Bigos Patch Pack (forum link) with custom GRF pack.
win32 binary: bigos_pack_1.2.rar | patch file: 12.patch | GRF's: finessegrfv3.rar
Terkhen
OpenTTD Developer
OpenTTD Developer
Posts: 1034
Joined: 11 Sep 2008 07:32
Location: Spain

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Terkhen »

I'm not sure I'm following you. TPPP is based on a nightly revision, in this case r18353. But if, for example, r18354 only changed parts of the code unrelated to TPPP, the TPPP diff file will still apply correctly. This is also true backwards: if r18353 itself does not affect any of the patches of TPPP, the diff file could also be applied to r18352 and so on.
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by petert »

finesse wrote:Aha, it seems I was under the miss guided impression that people based PP's off of nightly revisions.. never mind me.

Thanks for the patch pack nonetheless.
As Terkhen described, they are. They can be applied to any nightly revision, but it's likely (probable) that you will get many errors.
finesse
Engineer
Engineer
Posts: 24
Joined: 07 Aug 2007 21:10

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by finesse »

Terkhen wrote:I'm not sure I'm following you. TPPP is based on a nightly revision, in this case r18353. But if, for example, r18354 only changed parts of the code unrelated to TPPP, the TPPP diff file will still apply correctly. This is also true backwards: if r18353 itself does not affect any of the patches of TPPP, the diff file could also be applied to r18352 and so on.
By nightly revision I meant one of these -> http://binaries.openttd.org/nightlies/trunk/

You can only get r18353 from SVN, or at-least as far as I know. Sorry the confusion.
Image
Currently running: Bigos Patch Pack (forum link) with custom GRF pack.
win32 binary: bigos_pack_1.2.rar | patch file: 12.patch | GRF's: finessegrfv3.rar
User avatar
Gremnon
Tycoon
Tycoon
Posts: 1517
Joined: 16 Sep 2005 12:23
Skype: the_gremnon
Location: /home
Contact:

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Gremnon »

Those are nightlies too.

It's safest to assume that it will work with the revision (either from the OpenTTD site or checked out from the SVN repository) that is listed in it's name, currently, r18353. It's also safe to assume that the more revisions behind/ahead that revision, the more chances there are that some commit made to trunk will cause a problem with the patch. All that's needed is a little intrepid bravery (And a text editor) to have a look at the output, examine where it had a problem, and see if there's a quick-fix by looking at the line(s) in conflict.
Usually, it isn't too hard.
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by petert »

finesse wrote:By nightly revision I meant one of these -> http://binaries.openttd.org/nightlies/trunk/

You can only get r18353 from SVN, or at-least as far as I know. Sorry the confusion.
I don't know if this helps, but, when I didn't really use SVN to get the source, I would just go to the binaries site and pick the revision closest to what I needed, and patch that. But, in MSYS you can also just use svn up -r<insert revision number> to update to the revision.
User avatar
Gremnon
Tycoon
Tycoon
Posts: 1517
Joined: 16 Sep 2005 12:23
Skype: the_gremnon
Location: /home
Contact:

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Gremnon »

Useful note about svn update - you can also 'update' to an older revision.
Though personally, I suggest doing a proper checkout of that revision instead, but you can still do an 'update' to it.
Found that out last night.
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by petert »

Oh yes that's been a useful trick for a while. I usually have different folders for different patchpacks/versions. For example, a TPPP folder, a GPP folder, a trunk folder, and trunk2 folder.
Terkhen
OpenTTD Developer
OpenTTD Developer
Posts: 1034
Joined: 11 Sep 2008 07:32
Location: Spain

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Terkhen »

After using "svn revert -R ." and removing all unversioned files at the local copy, it should be completely clean without having to checkout a new copy. For unix systems you can find a lot of perl or bash scripts to remove unversioned files with a quick search. I have been using a batch file in windows to clean my trunk folder from modified and unversioned files. It needs to be placed in a folder included in your PATH (never place it at the trunk folder, it will delete itself). Of course, you will need to install gnuwin32 sed, awk, xargs and coreutils to make it work. Probably you can achieve this using MinGW, but probably you will need to change the second sed command.

Code: Select all

svn revert -R .
svn status | sed "/^[^?]/d" | sed "s/\\/\\\\/g" | awk "{print $2}" | xargs rm -rf
Edit: To check if your svn checkout is clean, use "svn status". It shouldn't list any files if it is clean.
User avatar
Gremnon
Tycoon
Tycoon
Posts: 1517
Joined: 16 Sep 2005 12:23
Skype: the_gremnon
Location: /home
Contact:

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Gremnon »

A useful tool for Linux users to have a look at for easy management of SVN checkouts and the various tasks Terkhen just mentioned is Subcommander.
I'm not sure if they have ports to other OSs, but it's likely.
Auge
Chief Executive
Chief Executive
Posts: 661
Joined: 23 Oct 2006 02:07
Location: Berlin

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Auge »

Hello
Gremnon wrote:A useful tool for Linux users to have a look at for easy management of SVN checkouts and the various tasks Terkhen just mentioned is Subcommander.
You talk about this software?
Gremnon wrote:I'm not sure if they have ports to other OSs, but it's likely.
The page should clear this question. :-)

Tschö, Auge
Terkhen
OpenTTD Developer
OpenTTD Developer
Posts: 1034
Joined: 11 Sep 2008 07:32
Location: Spain

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by Terkhen »

Sounds better than TortoiseSVN (but is probably more complicated to use). I'm more confortable using the console anyways.
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Terkhen's Personal Patch Pack [r18353-v11]

Post by petert »

Terkhen wrote:Sounds better than TortoiseSVN (but is probably more complicated to use). I'm more confortable using the console anyways.
I like using the console because it allows me to see what I am really doing.
Terkhen
OpenTTD Developer
OpenTTD Developer
Posts: 1034
Joined: 11 Sep 2008 07:32
Location: Spain

Re: Terkhen's Personal Patch Pack [r18407-v12]

Post by Terkhen »

v12 comes earlier than usual, because I plan to celebrate r18404 with a road vehicles only game. The diff file and the readme can be found at the development page.

r18407-v12: Improved acceleration for road vehicles updated to v13. Updated Signals in tunnels and on bridges to v28. Removed Pathfinder penalty for road vehicles.
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Terkhen's Personal Patch Pack [r18407-v12]

Post by petert »

Ah, the feature was based on your patch? That is why you removed pathfinder penalty for road vehicles?
Terkhen
OpenTTD Developer
OpenTTD Developer
Posts: 1034
Joined: 11 Sep 2008 07:32
Location: Spain

Re: Terkhen's Personal Patch Pack [r18407-v12]

Post by Terkhen »

Pathfinder penalty for road vehicles is not my patch, Roujin made it. You can see why the patch was removed at the issues tab in the development page. r18404 is not based on any of my patches (or in Pathfinder penalty for road vehicles). It's just that I have been waiting for a really long time to see FS #1944 closed. Now I can finally enjoy a road vehicle only game without getting mad with the traffic jams.
precelek
Engineer
Engineer
Posts: 1
Joined: 09 Dec 2009 23:38

Re: Terkhen's Personal Patch Pack [r18407-v12]

Post by precelek »

Hi can you help me, i have a problem how to decrese the resolution to see the whole game screen in Nokia E52. And an other thing why cant i hear music? My nokia player detects music filed.

Pleas help me
Terkhen
OpenTTD Developer
OpenTTD Developer
Posts: 1034
Joined: 11 Sep 2008 07:32
Location: Spain

Re: Terkhen's Personal Patch Pack [r18407-v12]

Post by Terkhen »

The latest version of TPPP is ready. The diff file and the readme can be found at the development page.

r18508-v13: Added Build roads up to obstacles and Pathfinder penalty for road vehicles.
User avatar
ColdIce
Transport Coordinator
Transport Coordinator
Posts: 314
Joined: 25 Apr 2006 10:22
Location: Bucharest

Re: Terkhen's Personal Patch Pack

Post by ColdIce »

Note: There will be no more updates for TPPP.

why? :cry:
The rest is confetti!
petert
Tycoon
Tycoon
Posts: 3008
Joined: 02 Apr 2009 22:43
Location: Massachusetts, USA

Re: Terkhen's Personal Patch Pack

Post by petert »

ColdIce wrote:Note: There will be no more updates for TPPP.

why? :cry:
There have been updates, just not reported here. See this page for the latest builds: http://code.google.com/p/tppp/downloads/list
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: Semrush [Bot] and 20 guests