[patch] Clipboard (a/k/a "Copy and Paste")

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

agentw4b
Traffic Manager
Traffic Manager
Posts: 180
Joined: 14 Apr 2017 15:51
Location: Czech Republic

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by agentw4b »

Unfortunately, with this "Copy / Paste patch" I did not find a way to make templates.
It is not possible to save the template out of the game.
It's probably deliberately blocked, so I do not use it anymore.
Owner and admin of servers:Experimental games 01 (92.63.57.152:3979), Experimental games 02 (92.63.57.152:3879), Experimental games 03 (92.63.57.152:3779), Experimental games 04 (92.63.57.152:3679), Experimental games 05 (92.63.57.152:3579).
My heightmaps: Flat Earth Map and United nations logo
My scenarios: Game Fallout 1,2,3 Map scenario
My gamescripts: City Founder GS

eisenbahner
Engineer
Engineer
Posts: 5
Joined: 01 Dec 2017 19:19

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by eisenbahner »

but why save them outside the game. its fair enough to just build an intersection, station or junction only one time on a map and then just copy it on places where its needed. but i am anyway to stupid to integrate it in jokers patch pack :(

Starbud
Traffic Manager
Traffic Manager
Posts: 210
Joined: 05 Mar 2007 00:48
Location: Sweden
Contact:

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by Starbud »

Oh i can live with it, altho a save function would be nice.
Either way i happily use the lovely patch, thank you all who have coded it =)
http://openttd.org - i love building stuff :)
Someones play with pics http://dimalimsliv.blogg.se

eisenbahner
Engineer
Engineer
Posts: 5
Joined: 01 Dec 2017 19:19

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by eisenbahner »

Starbud wrote:Oh i can live with it, altho a save function would be nice.
Either way i happily use the lovely patch, thank you all who have coded it =)
wich patchpak do you use? I really want to start playing again (after 5 years of break) but i cant play without clipboard as my maps and networks are really huge and i would smash my mouse and keyboard if i have to build over 1000 intersections, stations and other stuff manually

Starbud
Traffic Manager
Traffic Manager
Posts: 210
Joined: 05 Mar 2007 00:48
Location: Sweden
Contact:

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by Starbud »

I'll paste the startup screen of my clipboard version.
I'm not sure exactly where i got it but i think i picked it up from one of the posts in this thread.
I have used many diffrent versions and patchpacks with diffrent clipboard versions over the years.
Right now i don't have the time to do the research for wich ones there are, it would be interesting to me to make a list of the ones in existence so if you like you can remind me of this post in like 3 weeks i think.
Not promising to do it but i'd like to assemble that list at some point.

Oh by the way, i'd love to se screenshots from your games, i love those huge networks :)
Maybe some savegames?
Attachments
OTTD clipboard version used.png
(1.54 MiB) Not downloaded yet
http://openttd.org - i love building stuff :)
Someones play with pics http://dimalimsliv.blogg.se

mysloksztaltny
Engineer
Engineer
Posts: 1
Joined: 10 Jul 2018 18:45

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by mysloksztaltny »

Can someone share not to old version (maybe 1.8.0) precompiled binaries with this patch for windows?

agentw4b
Traffic Manager
Traffic Manager
Posts: 180
Joined: 14 Apr 2017 15:51
Location: Czech Republic

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by agentw4b »

I would also like to welcome some new version :-)
Owner and admin of servers:Experimental games 01 (92.63.57.152:3979), Experimental games 02 (92.63.57.152:3879), Experimental games 03 (92.63.57.152:3779), Experimental games 04 (92.63.57.152:3679), Experimental games 05 (92.63.57.152:3579).
My heightmaps: Flat Earth Map and United nations logo
My scenarios: Game Fallout 1,2,3 Map scenario
My gamescripts: City Founder GS

cadufour
Engineer
Engineer
Posts: 2
Joined: 21 Sep 2018 15:58

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by cadufour »

Hi all, any chance someone can help me to make this Patch work for MacOS?

Nidhoegger
Engineer
Engineer
Posts: 1
Joined: 29 Oct 2018 07:33

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by Nidhoegger »

For anyone interested: I made the patch work on 1.8.0. There was just a minor mashup in the patch. Have fun.

P.S.: No, i wont do precompiled binaries. I am a Linux user and do not have Windows. Any other Linuxuser should be able to compile this themselves. Its not that hard.

P.P.S: Thanks for the original author for his work. This patch is NOT MY WORK, I have just ported it to 1.8.0!
Attachments
clipbrd-1.8.0.patch
(1.68 MiB) Downloaded 164 times

Letharion
Engineer
Engineer
Posts: 8
Joined: 18 Feb 2009 12:33

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by Letharion »

The patch from Nidhoegger doesn't appear correct to me. It could be, but I can can't apply it, it's three times larger than the previous patch, and a manual inspection suggests it doesn't apply to 1.8.0 any way.

I've applied the previous patch instead, "the_clipboard_2.0.0_beta1-ottd_r27875-svn.patch" and rebased it onto 1.8.0. This worked really well except for a small conflict in clear_cmp.cpp. I must confess I don't entirely know if I resolved the conflict correctly, but with a quick gameplay it seems to be working.
Attachments
clipboard-1.8.0.patch
(582.64 KiB) Downloaded 185 times

chmistry
Engineer
Engineer
Posts: 3
Joined: 26 Feb 2019 22:36

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by chmistry »

Thanks Letharion, your patch creates a working binary on my system.
I've compiled openttd 1.8.1 from source on Ubuntu 18.04.2 LTS with your patch applied.

I can only get it working by running the openttd executable directly from the command line with the clipboard.cfg in the same folder as the executable.

After removal of the apt version it still does not run (in Gnome I only see a flash then nothing). On the command line I get a complaint about the clipboard.cfg file missing :

Error: Cannot open file 'clipboard.grf'

Could somebody explain to me where I should place this file?

agentw4b
Traffic Manager
Traffic Manager
Posts: 180
Joined: 14 Apr 2017 15:51
Location: Czech Republic

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by agentw4b »

chmistry wrote:Thanks Letharion, your patch creates a working binary on my system.
I've compiled openttd 1.8.1 from source on Ubuntu 18.04.2 LTS with your patch applied.

I can only get it working by running the openttd executable directly from the command line with the clipboard.cfg in the same folder as the executable.

After removal of the apt version it still does not run (in Gnome I only see a flash then nothing). On the command line I get a complaint about the clipboard.cfg file missing :

Error: Cannot open file 'clipboard.grf'

Could somebody explain to me where I should place this file?
download/file.php?id=202300
Owner and admin of servers:Experimental games 01 (92.63.57.152:3979), Experimental games 02 (92.63.57.152:3879), Experimental games 03 (92.63.57.152:3779), Experimental games 04 (92.63.57.152:3679), Experimental games 05 (92.63.57.152:3579).
My heightmaps: Flat Earth Map and United nations logo
My scenarios: Game Fallout 1,2,3 Map scenario
My gamescripts: City Founder GS

chmistry
Engineer
Engineer
Posts: 3
Joined: 26 Feb 2019 22:36

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by chmistry »

agentw4b wrote:
chmistry wrote: I can only get it working by running the openttd executable directly from the command line with the clipboard.cfg in the same folder as the executable.

After removal of the apt version it still does not run (in Gnome I only see a flash then nothing). On the command line I get a complaint about the clipboard.cfg file missing :

Error: Cannot open file 'clipboard.grf'

Could somebody explain to me where I should place this file?
download/file.php?id=202300
Thanks, but I already have the clipboard.grf file, my problem is that I don't know where to place it in Ubuntu in order to run the executable.

Letharion
Engineer
Engineer
Posts: 8
Joined: 18 Feb 2009 12:33

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by Letharion »

I'm not sure I understand what your problem is, since you say you can get it running provided you use the CLI?
You want to use a short cut, like on the desktop or something similar? If so, setting the short cut to use the clipboard file's directory as working directory might work.

If you're asking where openttd in general might look for grfs, I don't know what the answer is, but I would try checking where the other grf-files end up being installed.
See this question for how to locate the files: https://askubuntu.com/questions/32507/h ... -a-package

agentw4b
Traffic Manager
Traffic Manager
Posts: 180
Joined: 14 Apr 2017 15:51
Location: Czech Republic

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by agentw4b »

Thanks, but I already have the clipboard.grf file, my problem is that I don't know where to place it in Ubuntu in order to run the executable.
/home/(youruser)/.openttd/NeWGRF
Owner and admin of servers:Experimental games 01 (92.63.57.152:3979), Experimental games 02 (92.63.57.152:3879), Experimental games 03 (92.63.57.152:3779), Experimental games 04 (92.63.57.152:3679), Experimental games 05 (92.63.57.152:3579).
My heightmaps: Flat Earth Map and United nations logo
My scenarios: Game Fallout 1,2,3 Map scenario
My gamescripts: City Founder GS

chmistry
Engineer
Engineer
Posts: 3
Joined: 26 Feb 2019 22:36

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by chmistry »

Thanks all, I managed to fix the issue by placing the clipboard.grf file in /usr/local/share/games/openttd/baseset/

Apparently this is the location where my clipboard version is looking for the file at startup.

User avatar
xxxvinniexxx
Engineer
Engineer
Posts: 39
Joined: 26 Jul 2004 09:29
Location: Oldenzaal, the Netherlands

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by xxxvinniexxx »

Is there any development going on on this patch ?

User avatar
kamnet
Moderator
Moderator
Posts: 7327
Joined: 28 Sep 2009 17:15
Location: Eastern KY
Contact:

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by kamnet »

xxxvinniexxx wrote:
17 Jan 2020 18:49
Is there any development going on on this patch ?
Probably not, otherwise somebody would have posted something more recently. The original author hasn't been here in over two years.

McDeffice
Engineer
Engineer
Posts: 10
Joined: 26 May 2012 23:13

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by McDeffice »

[+] Spoiler
E:\openttd-1.9.3>patch -p1 < clipboard-1.8.0.patch
patching file source.list
Hunk #2 succeeded at 146 (offset -6 lines).
Hunk #3 succeeded at 161 (offset -6 lines).
Hunk #4 succeeded at 363 (offset -2 lines).
Hunk #5 succeeded at 460 (offset 1 line).
Hunk #6 succeeded at 521 (offset 2 lines).
Hunk #7 succeeded at 578 (offset 3 lines).
patching file src/bridge_map.cpp
Hunk #2 FAILED at 59.
1 out of 3 hunks FAILED -- saving rejects to file src/bridge_map.cpp.rej
patching file src/bridge_map.h
Hunk #8 FAILED at 135.
Hunk #9 succeeded at 158 (offset 1 line).
Hunk #10 succeeded at 175 (offset 1 line).
Hunk #11 succeeded at 187 (offset 1 line).
1 out of 11 hunks FAILED -- saving rejects to file src/bridge_map.h.rej
patching file src/clear_cmd.cpp
Hunk #4 succeeded at 393 (offset 1 line).
Hunk #5 succeeded at 531 (offset 1 line).
patching file src/clear_map.h
Hunk #19 FAILED at 271.
Hunk #20 FAILED at 291.
Hunk #21 succeeded at 312 (offset 2 lines).
Hunk #22 succeeded at 332 (offset 2 lines).
2 out of 22 hunks FAILED -- saving rejects to file src/clear_map.h.rej
patching file src/clipboard.cpp
patching file src/clipboard_func.h
patching file src/clipboard_gui.cpp
patching file src/clipboard_gui.h
patching file src/clipboard_type.h
patching file src/command.cpp
Hunk #3 succeeded at 202 (offset 2 lines).
Hunk #4 succeeded at 219 (offset 2 lines).
Hunk #5 succeeded at 229 (offset 2 lines).
Hunk #6 succeeded at 366 (offset 4 lines).
patching file src/command_func.h
patching file src/command_type.h
Hunk #4 succeeded at 349 (offset 3 lines).
Hunk #5 succeeded at 362 (offset 3 lines).
patching file src/copypaste_cmd.cpp
patching file src/copypaste_cmd.h
patching file src/core/bitmath_func.hpp
Hunk #1 succeeded at 322 (offset 2 lines).
patching file src/core/geometry_func.cpp
patching file src/core/geometry_func.hpp
patching file src/core/math_func.hpp
patching file src/crashlog.cpp
Hunk #1 succeeded at 397 (offset 17 lines).
patching file src/depot_map.h
patching file src/direction_func.h
patching file src/direction_type.h
patching file src/dock_gui.cpp
patching file src/gfxinit.cpp
patching file src/gui.h
patching file src/industry_cmd.cpp
Hunk #4 succeeded at 1835 (offset 42 lines).
Hunk #5 succeeded at 2904 (offset 43 lines).
Hunk #6 succeeded at 3074 (offset 43 lines).
patching file src/industry_map.h
patching file src/landscape.cpp
Hunk #2 succeeded at 1401 (offset 88 lines).
patching file src/lang/english.txt
Hunk #1 succeeded at 455 (offset 2 lines).
Hunk #2 succeeded at 1269 with fuzz 2 (offset 15 lines).
Hunk #3 succeeded at 2413 (offset 21 lines).
Hunk #4 succeeded at 2536 (offset 21 lines).
Hunk #5 succeeded at 4265 (offset 86 lines).
Hunk #6 succeeded at 4305 (offset 86 lines).
Hunk #7 succeeded at 4314 (offset 86 lines).
Hunk #8 succeeded at 4356 (offset 86 lines).
Hunk #9 succeeded at 4506 (offset 85 lines).
patching file src/map.cpp
patching file src/map_func.h
Hunk #11 succeeded at 741 (offset 12 lines).
patching file src/map_type.h
Hunk #2 succeeded at 40 with fuzz 1 (offset 1 line).
Hunk #3 succeeded at 79 (offset 1 line).
patching file src/misc.cpp
Hunk #1 succeeded at 51 (offset 1 line).
Hunk #2 succeeded at 96 (offset 2 lines).
patching file src/misc_gui.cpp
Hunk #1 FAILED at 123.
1 out of 1 hunk FAILED -- saving rejects to file src/misc_gui.cpp.rej
patching file src/network/network_command.cpp
patching file src/newgrf_airport.h
patching file src/newgrf_house.cpp
patching file src/newgrf_house.h
Hunk #1 succeeded at 100 with fuzz 2.
patching file src/newgrf_station.cpp
patching file src/newgrf_station.h
patching file src/object_cmd.cpp
Hunk #3 succeeded at 837 (offset 1 line).
Hunk #4 succeeded at 945 (offset 1 line).
patching file src/object_map.h
patching file src/rail.cpp
Hunk #2 succeeded at 192 with fuzz 2.
patching file src/rail_cmd.cpp
Hunk #3 FAILED at 433.
Hunk #4 succeeded at 486 (offset 4 lines).
Hunk #5 succeeded at 521 (offset 4 lines).
Hunk #6 succeeded at 541 (offset 4 lines).
Hunk #7 FAILED at 550.
Hunk #8 succeeded at 1072 (offset 6 lines).
Hunk #9 succeeded at 3071 (offset 9 lines).
Hunk #10 succeeded at 3283 (offset 9 lines).
2 out of 10 hunks FAILED -- saving rejects to file src/rail_cmd.cpp.rej
patching file src/rail_gui.cpp
Hunk #1 FAILED at 192.
Hunk #2 FAILED at 886.
2 out of 2 hunks FAILED -- saving rejects to file src/rail_gui.cpp.rej
patching file src/rail_map.h
Hunk #7 FAILED at 119.
Hunk #8 FAILED at 129.
Hunk #28 FAILED at 538.
3 out of 28 hunks FAILED -- saving rejects to file src/rail_map.h.rej
patching file src/rev.cpp.in
Hunk #1 succeeded at 37 with fuzz 2 (offset -2 lines).
patching file src/road_cmd.cpp
Hunk #3 succeeded at 1860 (offset 4 lines).
Hunk #4 succeeded at 2058 (offset 4 lines).
patching file src/road_func.h
patching file src/road_gui.cpp
Hunk #1 FAILED at 633.
1 out of 1 hunk FAILED -- saving rejects to file src/road_gui.cpp.rej
patching file src/road_map.h
Hunk #27 succeeded at 482 (offset 1 line).
Hunk #28 succeeded at 492 (offset 1 line).
Hunk #29 succeeded at 512 (offset 1 line).
Hunk #30 succeeded at 543 (offset 1 line).
Hunk #31 succeeded at 552 (offset 1 line).
Hunk #32 succeeded at 572 (offset 1 line).
Hunk #33 FAILED at 596.
Hunk #34 succeeded at 619 (offset 2 lines).
1 out of 34 hunks FAILED -- saving rejects to file src/road_map.h.rej
patching file src/saveload/afterload.cpp
Hunk #1 succeeded at 126 (offset 1 line).
Hunk #2 succeeded at 152 (offset 1 line).
Hunk #3 succeeded at 571 (offset -1 lines).
Hunk #4 succeeded at 587 (offset -1 lines).
Hunk #5 succeeded at 826 (offset -1 lines).
Hunk #6 succeeded at 864 (offset -1 lines).
Hunk #7 succeeded at 945 (offset -1 lines).
Hunk #8 succeeded at 1005 (offset -1 lines).
Hunk #9 succeeded at 1032 (offset -1 lines).
Hunk #10 succeeded at 1054 (offset -1 lines).
Hunk #11 succeeded at 1072 (offset -1 lines).
Hunk #12 succeeded at 1099 (offset -1 lines).
Hunk #13 succeeded at 1170 (offset 31 lines).
Hunk #14 succeeded at 1193 (offset 31 lines).
Hunk #15 succeeded at 1209 (offset 31 lines).
Hunk #16 succeeded at 1320 (offset 31 lines).
Hunk #17 succeeded at 1445 with fuzz 1 (offset 31 lines).
Hunk #18 succeeded at 1484 (offset 31 lines).
Hunk #19 succeeded at 1544 with fuzz 2 (offset 31 lines).
Hunk #20 succeeded at 1608 (offset 31 lines).
Hunk #21 succeeded at 1654 with fuzz 1 (offset 31 lines).
Hunk #22 succeeded at 1690 with fuzz 1 (offset 31 lines).
Hunk #23 succeeded at 1758 (offset 31 lines).
Hunk #24 succeeded at 1769 (offset 31 lines).
Hunk #25 succeeded at 1797 (offset 31 lines).
Hunk #26 succeeded at 1886 (offset 31 lines).
Hunk #27 succeeded at 1921 (offset 32 lines).
Hunk #28 succeeded at 1935 (offset 32 lines).
Hunk #29 succeeded at 2030 (offset 32 lines).
Hunk #30 succeeded at 2043 (offset 32 lines).
Hunk #31 succeeded at 2062 (offset 32 lines).
Hunk #32 succeeded at 2084 (offset 32 lines).
Hunk #33 FAILED at 2274.
Hunk #34 succeeded at 2336 (offset 39 lines).
Hunk #35 succeeded at 2459 (offset 39 lines).
Hunk #36 succeeded at 2800 (offset 39 lines).
Hunk #37 succeeded at 2926 (offset 39 lines).
1 out of 37 hunks FAILED -- saving rejects to file src/saveload/afterload.cpp.rej
patching file src/saveload/map_sl.cpp
Hunk #7 succeeded at 128 with fuzz 2.
patching file src/saveload/oldloader_sl.cpp
Hunk #1 succeeded at 48 (offset 1 line).
Hunk #2 succeeded at 200 (offset 1 line).
Hunk #3 succeeded at 230 (offset 1 line).
Hunk #4 succeeded at 241 (offset 1 line).
Hunk #5 succeeded at 260 (offset 1 line).
Hunk #6 succeeded at 275 (offset 1 line).
Hunk #7 succeeded at 1473 (offset -4 lines).
Hunk #8 succeeded at 1491 (offset -4 lines).
Hunk #9 succeeded at 1506 (offset -4 lines).
patching file src/saveload/station_sl.cpp
patching file src/saveload/waypoint_sl.cpp
Hunk #2 FAILED at 111.
1 out of 2 hunks FAILED -- saving rejects to file src/saveload/waypoint_sl.cpp.rej
patching file src/script/api/game/game_window.hpp.sq
Hunk #2 succeeded at 253 (offset 2 lines).
Hunk #3 succeeded at 1181 (offset 25 lines).
Hunk #4 succeeded at 1198 (offset 25 lines).
patching file src/script/api/script_window.hpp
Hunk #2 succeeded at 114 (offset 1 line).
Hunk #3 succeeded at 151 (offset 1 line).
Hunk #4 succeeded at 159 (offset 1 line).
Hunk #5 succeeded at 1011 (offset 13 lines).
Hunk #6 succeeded at 2402 (offset 45 lines).
Hunk #7 succeeded at 2423 (offset 45 lines).
patching file src/script/api/template/template_window.hpp.sq
patching file src/settings_type.h
Hunk #1 succeeded at 322 (offset 10 lines).
patching file src/slope_func.h
patching file src/station_cmd.cpp
Hunk #3 FAILED at 102.
Hunk #5 succeeded at 1147 (offset 42 lines).
Hunk #6 succeeded at 1174 (offset 42 lines).
Hunk #7 succeeded at 1299 (offset 42 lines).
Hunk #8 succeeded at 1330 (offset 42 lines).
Hunk #9 succeeded at 1418 (offset 42 lines).
Hunk #10 succeeded at 1433 (offset 42 lines).
Hunk #11 succeeded at 1848 with fuzz 1 (offset 36 lines).
Hunk #12 succeeded at 1861 with fuzz 2 (offset 36 lines).
Hunk #13 succeeded at 2267 (offset 27 lines).
Hunk #14 succeeded at 2331 (offset 27 lines).
Hunk #15 succeeded at 2537 (offset 22 lines).
Hunk #16 succeeded at 2557 (offset 22 lines).
Hunk #17 succeeded at 2592 (offset 22 lines).
Hunk #18 succeeded at 2610 with fuzz 2 (offset 21 lines).
Hunk #19 succeeded at 3732 (offset 20 lines).
Hunk #20 succeeded at 5393 (offset 20 lines).
1 out of 20 hunks FAILED -- saving rejects to file src/station_cmd.cpp.rej
patching file src/station_map.h
Hunk #36 FAILED at 586.
Hunk #37 succeeded at 610 (offset 1 line).
Hunk #38 succeeded at 627 (offset 1 line).
Hunk #39 succeeded at 644 (offset 1 line).
Hunk #40 succeeded at 664 (offset 1 line).
Hunk #41 succeeded at 681 (offset 1 line).
Hunk #42 succeeded at 693 (offset 1 line).
Hunk #43 succeeded at 710 (offset 1 line).
1 out of 43 hunks FAILED -- saving rejects to file src/station_map.h.rej
patching file src/table/settings.ini
Hunk #1 succeeded at 417 (offset 1 line).
patching file src/table/sprites.h
Hunk #1 succeeded at 168 (offset 5 lines).
Hunk #2 succeeded at 1346 (offset 11 lines).
Hunk #3 succeeded at 1478 (offset 11 lines).
patching file src/terraform_cmd.cpp
Hunk #3 succeeded at 334 (offset -77 lines).
Hunk #4 succeeded at 400 (offset -77 lines).
Hunk #5 succeeded at 540 (offset -77 lines).
Hunk #6 succeeded at 553 (offset -77 lines).
patching file src/terraform_gui.cpp
patching file src/tile_cmd.h
patching file src/tile_map.cpp
Hunk #1 FAILED at 112.
Hunk #2 FAILED at 179.
Hunk #3 FAILED at 212.
Hunk #4 succeeded at 135 with fuzz 2 (offset -89 lines).
3 out of 4 hunks FAILED -- saving rejects to file src/tile_map.cpp.rej
patching file src/tile_map.h
Hunk #1 succeeded at 26 with fuzz 1.
Hunk #2 FAILED at 43.
Hunk #3 succeeded at 71 (offset 10 lines).
Hunk #4 succeeded at 94 (offset 9 lines).
Hunk #5 succeeded at 107 (offset 9 lines).
Hunk #6 succeeded at 130 (offset 9 lines).
Hunk #7 succeeded at 152 (offset 9 lines).
Hunk #8 succeeded at 164 (offset 9 lines).
Hunk #9 succeeded at 182 (offset 9 lines).
Hunk #10 succeeded at 203 (offset 9 lines).
Hunk #11 succeeded at 220 (offset 9 lines).
Hunk #12 succeeded at 230 (offset 9 lines).
Hunk #13 succeeded at 260 (offset 9 lines).
Hunk #14 succeeded at 272 (offset 9 lines).
Hunk #15 succeeded at 292 (offset 9 lines).
Hunk #16 succeeded at 307 (offset 9 lines).
Hunk #17 succeeded at 318 with fuzz 1 (offset 7 lines).
1 out of 17 hunks FAILED -- saving rejects to file src/tile_map.h.rej
patching file src/tile_type.h
patching file src/tilearea.cpp
patching file src/tilearea_func.h
patching file src/tilearea_type.h
patching file src/tilehighlight_type.h
patching file src/toolbar_gui.cpp
Hunk #1 succeeded at 980 (offset 13 lines).
Hunk #2 succeeded at 994 (offset 13 lines).
patching file src/town.h
Hunk #1 succeeded at 171 (offset 1 line).
Hunk #2 succeeded at 189 (offset 1 line).
patching file src/town_cmd.cpp
Hunk #2 succeeded at 2034 (offset 41 lines).
Hunk #3 succeeded at 2056 (offset 41 lines).
Hunk #4 succeeded at 2141 (offset 41 lines).
Hunk #5 succeeded at 2454 (offset 41 lines).
Hunk #6 succeeded at 2471 (offset 41 lines).
Hunk #7 FAILED at 2465.
Hunk #8 succeeded at 2601 (offset 42 lines).
Hunk #9 succeeded at 3680 (offset 90 lines).
Hunk #10 succeeded at 3767 (offset 90 lines).
1 out of 10 hunks FAILED -- saving rejects to file src/town_cmd.cpp.rej
patching file src/town_map.h
patching file src/track_func.h
Hunk #2 succeeded at 736 with fuzz 1 (offset 43 lines).
patching file src/tree_cmd.cpp
patching file src/tree_map.h
Hunk #1 succeeded at 57 (offset 1 line).
Hunk #2 succeeded at 84 (offset 1 line).
Hunk #3 succeeded at 100 (offset 1 line).
Hunk #4 succeeded at 126 (offset 1 line).
Hunk #5 FAILED at 142.
Hunk #6 succeeded at 163 (offset 2 lines).
Hunk #7 succeeded at 184 (offset 2 lines).
Hunk #8 succeeded at 196 (offset 2 lines).
Hunk #9 succeeded at 215 (offset 2 lines).
Hunk #10 succeeded at 231 (offset 2 lines).
Hunk #11 succeeded at 245 (offset 2 lines).
Hunk #12 succeeded at 260 (offset 2 lines).
Hunk #13 succeeded at 275 (offset 2 lines).
Hunk #14 FAILED at 288.
2 out of 14 hunks FAILED -- saving rejects to file src/tree_map.h.rej
patching file src/tunnel_map.cpp
patching file src/tunnel_map.h
Hunk #3 FAILED at 52.
Hunk #4 FAILED at 74.
2 out of 4 hunks FAILED -- saving rejects to file src/tunnel_map.h.rej
patching file src/tunnelbridge.h
patching file src/tunnelbridge_cmd.cpp
Hunk #3 succeeded at 215 (offset -12 lines).
Hunk #4 succeeded at 263 (offset -12 lines).
Hunk #5 succeeded at 584 with fuzz 2 (offset -12 lines).
Hunk #6 succeeded at 597 with fuzz 1 (offset -12 lines).
Hunk #7 succeeded at 608 (offset -12 lines).
Hunk #8 succeeded at 629 (offset -12 lines).
Hunk #9 succeeded at 680 (offset -12 lines).
Hunk #10 succeeded at 706 (offset -12 lines).
Hunk #11 succeeded at 732 (offset -12 lines).
Hunk #12 succeeded at 775 (offset 3 lines).
Hunk #13 succeeded at 1964 (offset 3 lines).
Hunk #14 succeeded at 2147 (offset 3 lines).
patching file src/tunnelbridge_map.h
patching file src/viewport.cpp
Hunk #2 succeeded at 904 (offset -34 lines).
Hunk #3 succeeded at 997 (offset -34 lines).
Hunk #4 succeeded at 1049 (offset -34 lines).
Hunk #5 succeeded at 2061 (offset -135 lines).
Hunk #6 succeeded at 2304 (offset -135 lines).
Hunk #7 succeeded at 3060 (offset -126 lines).
patching file src/viewport_type.h
Hunk #1 succeeded at 121 with fuzz 1.
patching file src/void_cmd.cpp
Hunk #1 succeeded at 88 (offset 5 lines).
patching file src/void_map.h
patching file src/water_cmd.cpp
Hunk #6 succeeded at 1324 (offset 1 line).
Hunk #7 succeeded at 1587 (offset 1 line).
patching file src/water_map.h
Hunk #2 succeeded at 93 with fuzz 2.
patching file src/waypoint_cmd.cpp
Hunk #5 succeeded at 199 (offset 1 line).
Hunk #6 succeeded at 209 (offset 1 line).
Hunk #7 succeeded at 269 (offset 1 line).
Hunk #8 succeeded at 311 (offset 1 line).
Hunk #9 succeeded at 357 (offset 1 line).
Hunk #10 succeeded at 408 (offset 1 line).
patching file src/widgets/clipboard_widget.h
patching file src/widgets/terraform_widget.h
patching file src/window.cpp
Hunk #1 succeeded at 2802 (offset 28 lines).
Hunk #2 FAILED at 2836.
1 out of 2 hunks FAILED -- saving rejects to file src/window.cpp.rej
patching file src/window_gui.h
Hunk #1 succeeded at 788 (offset 20 lines).
patching file src/window_type.h

E:\openttd-1.9.3>

User avatar
kamnet
Moderator
Moderator
Posts: 7327
Joined: 28 Sep 2009 17:15
Location: Eastern KY
Contact:

Re: [patch] Clipboard (a/k/a "Copy and Paste")

Post by kamnet »

You're attempting to apply a patch written for OpenTTD 1.8.0 (over 2 years ago) against OpenTTD 1.9.3 (several months ago). Source code is continually updated. In order to successfully apply this patch you will first need to update the patch to match the changes in the source code. The failed lines will give you a clue as to what's changed. You'll probably need to analyze the 1.8.0 code to figure that out.

Also, if you apply a patch against OpenTTD 1.9.3, it no longer is technically version 1.9.3, and it will not be compatible with other 1.9.3 clients. It's best to apply it against a nightly, so at least you get the benefits of game improvements and bug fixes.
McDeffice wrote:
02 Feb 2020 22:57
[+] Spoiler
E:\openttd-1.9.3>patch -p1 < clipboard-1.8.0.patch
patching file source.list
Hunk #2 succeeded at 146 (offset -6 lines).
Hunk #3 succeeded at 161 (offset -6 lines).
Hunk #4 succeeded at 363 (offset -2 lines).
Hunk #5 succeeded at 460 (offset 1 line).
Hunk #6 succeeded at 521 (offset 2 lines).
Hunk #7 succeeded at 578 (offset 3 lines).
patching file src/bridge_map.cpp
Hunk #2 FAILED at 59.
1 out of 3 hunks FAILED -- saving rejects to file src/bridge_map.cpp.rej
patching file src/bridge_map.h
Hunk #8 FAILED at 135.
Hunk #9 succeeded at 158 (offset 1 line).
Hunk #10 succeeded at 175 (offset 1 line).
Hunk #11 succeeded at 187 (offset 1 line).
1 out of 11 hunks FAILED -- saving rejects to file src/bridge_map.h.rej
patching file src/clear_cmd.cpp
Hunk #4 succeeded at 393 (offset 1 line).
Hunk #5 succeeded at 531 (offset 1 line).
patching file src/clear_map.h
Hunk #19 FAILED at 271.
Hunk #20 FAILED at 291.
Hunk #21 succeeded at 312 (offset 2 lines).
Hunk #22 succeeded at 332 (offset 2 lines).
2 out of 22 hunks FAILED -- saving rejects to file src/clear_map.h.rej
patching file src/clipboard.cpp
patching file src/clipboard_func.h
patching file src/clipboard_gui.cpp
patching file src/clipboard_gui.h
patching file src/clipboard_type.h
patching file src/command.cpp
Hunk #3 succeeded at 202 (offset 2 lines).
Hunk #4 succeeded at 219 (offset 2 lines).
Hunk #5 succeeded at 229 (offset 2 lines).
Hunk #6 succeeded at 366 (offset 4 lines).
patching file src/command_func.h
patching file src/command_type.h
Hunk #4 succeeded at 349 (offset 3 lines).
Hunk #5 succeeded at 362 (offset 3 lines).
patching file src/copypaste_cmd.cpp
patching file src/copypaste_cmd.h
patching file src/core/bitmath_func.hpp
Hunk #1 succeeded at 322 (offset 2 lines).
patching file src/core/geometry_func.cpp
patching file src/core/geometry_func.hpp
patching file src/core/math_func.hpp
patching file src/crashlog.cpp
Hunk #1 succeeded at 397 (offset 17 lines).
patching file src/depot_map.h
patching file src/direction_func.h
patching file src/direction_type.h
patching file src/dock_gui.cpp
patching file src/gfxinit.cpp
patching file src/gui.h
patching file src/industry_cmd.cpp
Hunk #4 succeeded at 1835 (offset 42 lines).
Hunk #5 succeeded at 2904 (offset 43 lines).
Hunk #6 succeeded at 3074 (offset 43 lines).
patching file src/industry_map.h
patching file src/landscape.cpp
Hunk #2 succeeded at 1401 (offset 88 lines).
patching file src/lang/english.txt
Hunk #1 succeeded at 455 (offset 2 lines).
Hunk #2 succeeded at 1269 with fuzz 2 (offset 15 lines).
Hunk #3 succeeded at 2413 (offset 21 lines).
Hunk #4 succeeded at 2536 (offset 21 lines).
Hunk #5 succeeded at 4265 (offset 86 lines).
Hunk #6 succeeded at 4305 (offset 86 lines).
Hunk #7 succeeded at 4314 (offset 86 lines).
Hunk #8 succeeded at 4356 (offset 86 lines).
Hunk #9 succeeded at 4506 (offset 85 lines).
patching file src/map.cpp
patching file src/map_func.h
Hunk #11 succeeded at 741 (offset 12 lines).
patching file src/map_type.h
Hunk #2 succeeded at 40 with fuzz 1 (offset 1 line).
Hunk #3 succeeded at 79 (offset 1 line).
patching file src/misc.cpp
Hunk #1 succeeded at 51 (offset 1 line).
Hunk #2 succeeded at 96 (offset 2 lines).
patching file src/misc_gui.cpp
Hunk #1 FAILED at 123.
1 out of 1 hunk FAILED -- saving rejects to file src/misc_gui.cpp.rej
patching file src/network/network_command.cpp
patching file src/newgrf_airport.h
patching file src/newgrf_house.cpp
patching file src/newgrf_house.h
Hunk #1 succeeded at 100 with fuzz 2.
patching file src/newgrf_station.cpp
patching file src/newgrf_station.h
patching file src/object_cmd.cpp
Hunk #3 succeeded at 837 (offset 1 line).
Hunk #4 succeeded at 945 (offset 1 line).
patching file src/object_map.h
patching file src/rail.cpp
Hunk #2 succeeded at 192 with fuzz 2.
patching file src/rail_cmd.cpp
Hunk #3 FAILED at 433.
Hunk #4 succeeded at 486 (offset 4 lines).
Hunk #5 succeeded at 521 (offset 4 lines).
Hunk #6 succeeded at 541 (offset 4 lines).
Hunk #7 FAILED at 550.
Hunk #8 succeeded at 1072 (offset 6 lines).
Hunk #9 succeeded at 3071 (offset 9 lines).
Hunk #10 succeeded at 3283 (offset 9 lines).
2 out of 10 hunks FAILED -- saving rejects to file src/rail_cmd.cpp.rej
patching file src/rail_gui.cpp
Hunk #1 FAILED at 192.
Hunk #2 FAILED at 886.
2 out of 2 hunks FAILED -- saving rejects to file src/rail_gui.cpp.rej
patching file src/rail_map.h
Hunk #7 FAILED at 119.
Hunk #8 FAILED at 129.
Hunk #28 FAILED at 538.
3 out of 28 hunks FAILED -- saving rejects to file src/rail_map.h.rej
patching file src/rev.cpp.in
Hunk #1 succeeded at 37 with fuzz 2 (offset -2 lines).
patching file src/road_cmd.cpp
Hunk #3 succeeded at 1860 (offset 4 lines).
Hunk #4 succeeded at 2058 (offset 4 lines).
patching file src/road_func.h
patching file src/road_gui.cpp
Hunk #1 FAILED at 633.
1 out of 1 hunk FAILED -- saving rejects to file src/road_gui.cpp.rej
patching file src/road_map.h
Hunk #27 succeeded at 482 (offset 1 line).
Hunk #28 succeeded at 492 (offset 1 line).
Hunk #29 succeeded at 512 (offset 1 line).
Hunk #30 succeeded at 543 (offset 1 line).
Hunk #31 succeeded at 552 (offset 1 line).
Hunk #32 succeeded at 572 (offset 1 line).
Hunk #33 FAILED at 596.
Hunk #34 succeeded at 619 (offset 2 lines).
1 out of 34 hunks FAILED -- saving rejects to file src/road_map.h.rej
patching file src/saveload/afterload.cpp
Hunk #1 succeeded at 126 (offset 1 line).
Hunk #2 succeeded at 152 (offset 1 line).
Hunk #3 succeeded at 571 (offset -1 lines).
Hunk #4 succeeded at 587 (offset -1 lines).
Hunk #5 succeeded at 826 (offset -1 lines).
Hunk #6 succeeded at 864 (offset -1 lines).
Hunk #7 succeeded at 945 (offset -1 lines).
Hunk #8 succeeded at 1005 (offset -1 lines).
Hunk #9 succeeded at 1032 (offset -1 lines).
Hunk #10 succeeded at 1054 (offset -1 lines).
Hunk #11 succeeded at 1072 (offset -1 lines).
Hunk #12 succeeded at 1099 (offset -1 lines).
Hunk #13 succeeded at 1170 (offset 31 lines).
Hunk #14 succeeded at 1193 (offset 31 lines).
Hunk #15 succeeded at 1209 (offset 31 lines).
Hunk #16 succeeded at 1320 (offset 31 lines).
Hunk #17 succeeded at 1445 with fuzz 1 (offset 31 lines).
Hunk #18 succeeded at 1484 (offset 31 lines).
Hunk #19 succeeded at 1544 with fuzz 2 (offset 31 lines).
Hunk #20 succeeded at 1608 (offset 31 lines).
Hunk #21 succeeded at 1654 with fuzz 1 (offset 31 lines).
Hunk #22 succeeded at 1690 with fuzz 1 (offset 31 lines).
Hunk #23 succeeded at 1758 (offset 31 lines).
Hunk #24 succeeded at 1769 (offset 31 lines).
Hunk #25 succeeded at 1797 (offset 31 lines).
Hunk #26 succeeded at 1886 (offset 31 lines).
Hunk #27 succeeded at 1921 (offset 32 lines).
Hunk #28 succeeded at 1935 (offset 32 lines).
Hunk #29 succeeded at 2030 (offset 32 lines).
Hunk #30 succeeded at 2043 (offset 32 lines).
Hunk #31 succeeded at 2062 (offset 32 lines).
Hunk #32 succeeded at 2084 (offset 32 lines).
Hunk #33 FAILED at 2274.
Hunk #34 succeeded at 2336 (offset 39 lines).
Hunk #35 succeeded at 2459 (offset 39 lines).
Hunk #36 succeeded at 2800 (offset 39 lines).
Hunk #37 succeeded at 2926 (offset 39 lines).
1 out of 37 hunks FAILED -- saving rejects to file src/saveload/afterload.cpp.rej
patching file src/saveload/map_sl.cpp
Hunk #7 succeeded at 128 with fuzz 2.
patching file src/saveload/oldloader_sl.cpp
Hunk #1 succeeded at 48 (offset 1 line).
Hunk #2 succeeded at 200 (offset 1 line).
Hunk #3 succeeded at 230 (offset 1 line).
Hunk #4 succeeded at 241 (offset 1 line).
Hunk #5 succeeded at 260 (offset 1 line).
Hunk #6 succeeded at 275 (offset 1 line).
Hunk #7 succeeded at 1473 (offset -4 lines).
Hunk #8 succeeded at 1491 (offset -4 lines).
Hunk #9 succeeded at 1506 (offset -4 lines).
patching file src/saveload/station_sl.cpp
patching file src/saveload/waypoint_sl.cpp
Hunk #2 FAILED at 111.
1 out of 2 hunks FAILED -- saving rejects to file src/saveload/waypoint_sl.cpp.rej
patching file src/script/api/game/game_window.hpp.sq
Hunk #2 succeeded at 253 (offset 2 lines).
Hunk #3 succeeded at 1181 (offset 25 lines).
Hunk #4 succeeded at 1198 (offset 25 lines).
patching file src/script/api/script_window.hpp
Hunk #2 succeeded at 114 (offset 1 line).
Hunk #3 succeeded at 151 (offset 1 line).
Hunk #4 succeeded at 159 (offset 1 line).
Hunk #5 succeeded at 1011 (offset 13 lines).
Hunk #6 succeeded at 2402 (offset 45 lines).
Hunk #7 succeeded at 2423 (offset 45 lines).
patching file src/script/api/template/template_window.hpp.sq
patching file src/settings_type.h
Hunk #1 succeeded at 322 (offset 10 lines).
patching file src/slope_func.h
patching file src/station_cmd.cpp
Hunk #3 FAILED at 102.
Hunk #5 succeeded at 1147 (offset 42 lines).
Hunk #6 succeeded at 1174 (offset 42 lines).
Hunk #7 succeeded at 1299 (offset 42 lines).
Hunk #8 succeeded at 1330 (offset 42 lines).
Hunk #9 succeeded at 1418 (offset 42 lines).
Hunk #10 succeeded at 1433 (offset 42 lines).
Hunk #11 succeeded at 1848 with fuzz 1 (offset 36 lines).
Hunk #12 succeeded at 1861 with fuzz 2 (offset 36 lines).
Hunk #13 succeeded at 2267 (offset 27 lines).
Hunk #14 succeeded at 2331 (offset 27 lines).
Hunk #15 succeeded at 2537 (offset 22 lines).
Hunk #16 succeeded at 2557 (offset 22 lines).
Hunk #17 succeeded at 2592 (offset 22 lines).
Hunk #18 succeeded at 2610 with fuzz 2 (offset 21 lines).
Hunk #19 succeeded at 3732 (offset 20 lines).
Hunk #20 succeeded at 5393 (offset 20 lines).
1 out of 20 hunks FAILED -- saving rejects to file src/station_cmd.cpp.rej
patching file src/station_map.h
Hunk #36 FAILED at 586.
Hunk #37 succeeded at 610 (offset 1 line).
Hunk #38 succeeded at 627 (offset 1 line).
Hunk #39 succeeded at 644 (offset 1 line).
Hunk #40 succeeded at 664 (offset 1 line).
Hunk #41 succeeded at 681 (offset 1 line).
Hunk #42 succeeded at 693 (offset 1 line).
Hunk #43 succeeded at 710 (offset 1 line).
1 out of 43 hunks FAILED -- saving rejects to file src/station_map.h.rej
patching file src/table/settings.ini
Hunk #1 succeeded at 417 (offset 1 line).
patching file src/table/sprites.h
Hunk #1 succeeded at 168 (offset 5 lines).
Hunk #2 succeeded at 1346 (offset 11 lines).
Hunk #3 succeeded at 1478 (offset 11 lines).
patching file src/terraform_cmd.cpp
Hunk #3 succeeded at 334 (offset -77 lines).
Hunk #4 succeeded at 400 (offset -77 lines).
Hunk #5 succeeded at 540 (offset -77 lines).
Hunk #6 succeeded at 553 (offset -77 lines).
patching file src/terraform_gui.cpp
patching file src/tile_cmd.h
patching file src/tile_map.cpp
Hunk #1 FAILED at 112.
Hunk #2 FAILED at 179.
Hunk #3 FAILED at 212.
Hunk #4 succeeded at 135 with fuzz 2 (offset -89 lines).
3 out of 4 hunks FAILED -- saving rejects to file src/tile_map.cpp.rej
patching file src/tile_map.h
Hunk #1 succeeded at 26 with fuzz 1.
Hunk #2 FAILED at 43.
Hunk #3 succeeded at 71 (offset 10 lines).
Hunk #4 succeeded at 94 (offset 9 lines).
Hunk #5 succeeded at 107 (offset 9 lines).
Hunk #6 succeeded at 130 (offset 9 lines).
Hunk #7 succeeded at 152 (offset 9 lines).
Hunk #8 succeeded at 164 (offset 9 lines).
Hunk #9 succeeded at 182 (offset 9 lines).
Hunk #10 succeeded at 203 (offset 9 lines).
Hunk #11 succeeded at 220 (offset 9 lines).
Hunk #12 succeeded at 230 (offset 9 lines).
Hunk #13 succeeded at 260 (offset 9 lines).
Hunk #14 succeeded at 272 (offset 9 lines).
Hunk #15 succeeded at 292 (offset 9 lines).
Hunk #16 succeeded at 307 (offset 9 lines).
Hunk #17 succeeded at 318 with fuzz 1 (offset 7 lines).
1 out of 17 hunks FAILED -- saving rejects to file src/tile_map.h.rej
patching file src/tile_type.h
patching file src/tilearea.cpp
patching file src/tilearea_func.h
patching file src/tilearea_type.h
patching file src/tilehighlight_type.h
patching file src/toolbar_gui.cpp
Hunk #1 succeeded at 980 (offset 13 lines).
Hunk #2 succeeded at 994 (offset 13 lines).
patching file src/town.h
Hunk #1 succeeded at 171 (offset 1 line).
Hunk #2 succeeded at 189 (offset 1 line).
patching file src/town_cmd.cpp
Hunk #2 succeeded at 2034 (offset 41 lines).
Hunk #3 succeeded at 2056 (offset 41 lines).
Hunk #4 succeeded at 2141 (offset 41 lines).
Hunk #5 succeeded at 2454 (offset 41 lines).
Hunk #6 succeeded at 2471 (offset 41 lines).
Hunk #7 FAILED at 2465.
Hunk #8 succeeded at 2601 (offset 42 lines).
Hunk #9 succeeded at 3680 (offset 90 lines).
Hunk #10 succeeded at 3767 (offset 90 lines).
1 out of 10 hunks FAILED -- saving rejects to file src/town_cmd.cpp.rej
patching file src/town_map.h
patching file src/track_func.h
Hunk #2 succeeded at 736 with fuzz 1 (offset 43 lines).
patching file src/tree_cmd.cpp
patching file src/tree_map.h
Hunk #1 succeeded at 57 (offset 1 line).
Hunk #2 succeeded at 84 (offset 1 line).
Hunk #3 succeeded at 100 (offset 1 line).
Hunk #4 succeeded at 126 (offset 1 line).
Hunk #5 FAILED at 142.
Hunk #6 succeeded at 163 (offset 2 lines).
Hunk #7 succeeded at 184 (offset 2 lines).
Hunk #8 succeeded at 196 (offset 2 lines).
Hunk #9 succeeded at 215 (offset 2 lines).
Hunk #10 succeeded at 231 (offset 2 lines).
Hunk #11 succeeded at 245 (offset 2 lines).
Hunk #12 succeeded at 260 (offset 2 lines).
Hunk #13 succeeded at 275 (offset 2 lines).
Hunk #14 FAILED at 288.
2 out of 14 hunks FAILED -- saving rejects to file src/tree_map.h.rej
patching file src/tunnel_map.cpp
patching file src/tunnel_map.h
Hunk #3 FAILED at 52.
Hunk #4 FAILED at 74.
2 out of 4 hunks FAILED -- saving rejects to file src/tunnel_map.h.rej
patching file src/tunnelbridge.h
patching file src/tunnelbridge_cmd.cpp
Hunk #3 succeeded at 215 (offset -12 lines).
Hunk #4 succeeded at 263 (offset -12 lines).
Hunk #5 succeeded at 584 with fuzz 2 (offset -12 lines).
Hunk #6 succeeded at 597 with fuzz 1 (offset -12 lines).
Hunk #7 succeeded at 608 (offset -12 lines).
Hunk #8 succeeded at 629 (offset -12 lines).
Hunk #9 succeeded at 680 (offset -12 lines).
Hunk #10 succeeded at 706 (offset -12 lines).
Hunk #11 succeeded at 732 (offset -12 lines).
Hunk #12 succeeded at 775 (offset 3 lines).
Hunk #13 succeeded at 1964 (offset 3 lines).
Hunk #14 succeeded at 2147 (offset 3 lines).
patching file src/tunnelbridge_map.h
patching file src/viewport.cpp
Hunk #2 succeeded at 904 (offset -34 lines).
Hunk #3 succeeded at 997 (offset -34 lines).
Hunk #4 succeeded at 1049 (offset -34 lines).
Hunk #5 succeeded at 2061 (offset -135 lines).
Hunk #6 succeeded at 2304 (offset -135 lines).
Hunk #7 succeeded at 3060 (offset -126 lines).
patching file src/viewport_type.h
Hunk #1 succeeded at 121 with fuzz 1.
patching file src/void_cmd.cpp
Hunk #1 succeeded at 88 (offset 5 lines).
patching file src/void_map.h
patching file src/water_cmd.cpp
Hunk #6 succeeded at 1324 (offset 1 line).
Hunk #7 succeeded at 1587 (offset 1 line).
patching file src/water_map.h
Hunk #2 succeeded at 93 with fuzz 2.
patching file src/waypoint_cmd.cpp
Hunk #5 succeeded at 199 (offset 1 line).
Hunk #6 succeeded at 209 (offset 1 line).
Hunk #7 succeeded at 269 (offset 1 line).
Hunk #8 succeeded at 311 (offset 1 line).
Hunk #9 succeeded at 357 (offset 1 line).
Hunk #10 succeeded at 408 (offset 1 line).
patching file src/widgets/clipboard_widget.h
patching file src/widgets/terraform_widget.h
patching file src/window.cpp
Hunk #1 succeeded at 2802 (offset 28 lines).
Hunk #2 FAILED at 2836.
1 out of 2 hunks FAILED -- saving rejects to file src/window.cpp.rej
patching file src/window_gui.h
Hunk #1 succeeded at 788 (offset 20 lines).
patching file src/window_type.h

E:\openttd-1.9.3>

Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 6 guests