JGR's 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

User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

JGR's Patch Pack

Post by JGR »

Ever since I migrated from TTDPatch to OpenTTD, I've been playing on patch packs of one form or another, and so I finally decided to roll my own.

Current and previous releases are on GitHub.

See the wiki for guides on how to use some of the included features.

Version 0.58.1 includes the changes below:

Railways and Trains
  • Drive-through train depots.
  • Template-based train replacement.
  • Routing restrictions
    See the guide on the wiki for more information.
  • Programmable pre-signals.
    These are not shown in the build signal window by default.
    See the guide on the wiki for more information.
  • Freight train through load.
    This is an alternative loading mode for freight trains for the case where the train is longer then the platform.
  • Multiple rail types per tile.
  • Polyline rail track building tool.
  • Add news setting for trains waiting due to routing restrictions.
  • Add setting to enable flipping direction of all train types in depot.
  • Realistic train braking.
    In this mode, trains have a stopping distance and will reserve ahead accordingly, trains cannot stop instantly.
    See the guide on the wiki for more information.
  • Allow converting track type under trains when compatible with the new rail type.
  • Add feature where trains adjust their speed to match the train in front to avoid stop-start behaviour.
  • Add a new train purchase window, where locomotive and wagons are in separate lists.
  • Add information about train full and empty loads and achievable speeds to the train info window.
  • Add setting to sort track types by category and speed.
  • Add a setting for whether to pathfind up to back of a one-way path signal.
  • Multi-aspect signal graphics.
    This requires a NewGRF which supports this and realistic train braking.
  • No-entry signals.
    These are not shown in the build signal window by default.
  • Add client setting to show all signals using the default baseset sprites.
  • Remember the last-used signal type between games.
  • Add client setting to show the introduction year for train wagons.
  • Add setting for rail depot maximum speed.
  • Add setting to allow auto-fill signal dragging to skip over stations/waypoints.
Roads and Road Vehicles
  • One-way road and road vehicle overtaking enhancements.
    See the wiki for full details.
  • Add setting to allow articulated road vehicles to overtake other vehicles.
  • Add setting to control road vehicle re-routing on road layout changes.
  • Disallow ordering ordinary road vehicles to tram depots and vice versa.
  • Improve road vehicle pathfinding when multiple vehicles are simultaneously heading to a station with multiple bay/stop entrances.
  • Add setting for default road/tram types.
  • Add a setting to turn off road vehicles slowing in curves.
  • Add a setting to disable road vehicles from passing through each other when blocked for an extended period of time.
  • Allow road vehicle go to station/waypoint orders to have an associated required stop/bay/waypoint direction.
  • Allow changing road vehicle driving side when all road vehicles are in depots.
Level Crossings
  • Close adjacent level crossings.
  • Prevent road vehicles from being stopped on level crossings.
  • Add setting to enable improved level crossing safety.
  • Trains break down after colliding with a road vehicle.
  • Only show level crossing overlay sprites on the outsides of multi-track crossings when using both adjacent and safer crossings settings.
Bridges and Tunnels
  • Signals in tunnels and on bridges.
  • Custom bridge heads.
  • Chunnels (tunnels under bodies of water). Off by default.
  • Allow building rail stations under bridges, subject to height/clearance and bridge pillar limitations.
  • Add setting to allow placing NewGRF rail stations under bridges, when the GRF doesn't specify whether or not it can be placed under bridges.
  • Add setting to allow placing all NewGRF objects under bridges, even when it would not otherwise be allowed by the GRF.
  • Add setting to allow placing road/tram stops under bridges.
  • Add setting to allow placing docks under bridges.
  • Vehicles visible in tunnels (transparency setting).
AirportsShipsVehicles in General
  • Improved breakdowns.
  • Vehicle repair cost setting.
  • Send vehicles which need auto-renewing due to age, for servicing, even if breakdowns are off and no servicing if no breakdowns is on.
  • Add shift-clicking on vehicle depot button to select specific depot.
  • Cargo type filter in vehicle list windows.
  • Add client setting for vehicle naming scheme.
  • Vehicle lifetime profit.
  • Add settings to disable vehicle expiry and introduction after the given years.
  • Open train vehicle details window on total cargo tab if shift pressed.
  • Add news/advice setting to warn if no depot order in vehicle schedule.
  • Add buttons to collapse/expand all groups.
  • Add a menu item to the vehicle list to assign all listed vehicles to a new group.
  • Add a setting to include the train length and group name in the vehicle details window.
  • Add a setting for whether to open the new vehicle GUI when share-cloning.
  • Add setting to disable mass action buttons for top-level vehicle lists.
  • Add feature to create a new auto-named group when dragging and dropping a vehicle onto the new group button (ctrl includes shared order vehicles).
  • Add settings to reduce vehicle running costs when a vehicle is stationary or in a depot.
  • If a vehicle's next order is for the current station when leaving, start loading again without moving, instead of leaving.
  • Slots and counters.
    See the guide on the wiki for more information.
  • Add cargo capacity / running cost sort mode to the build vehicle window.
  • Add client settings to show the full group hierarchy in group and vehicle names.
  • Allow changing colour of orders in order list and timetable windows.
  • Add text label and departure board via order types.
Orders and Timetabling
  • Automated timetables and separation.
  • Allow clearing of timetable time fields which are at 0. Allow explicitly setting timetable time fields to 0 without clearing them.
  • Allow changing/clearing the timetabled waiting time and max speed of all of a vehicle's orders at once.
  • Add client setting to show the remainder ticks in timetable, after dividing to days or minutes.
  • Add a company setting to control the number of ticks used in auto-fill timetable rounding.
  • Cargo type orders.
    This allows order load/unload types to be set per cargo type. (This does work with cargodist).
  • Order occupancy.
    Add column to the orders GUI to show occupancy running average, show the average order occupancy, and add a vehicle sort mode.
  • Timetabling waiting time in depots.
  • Scheduled dispatch.
    This allows dispatching vehicles from timing points using one or more repeating schedules. This is useful for clock-face timetabling.
  • More conditional orders.
    Next station: is cargo waiting, is cargo accepted, number of free platforms, amount of cargo waiting.
    Percent of times, per-cargo load percentage, current time/date, timetable lateness.
    Slots/counters: train in slot, slot occupancy, counter value.
    Scheduled dispatch departure slots.
  • Reverse at waypoint orders.
  • Add a menu item to the vehicle list to change order target, e.g. for moving depot orders to a different depot.
  • Add game setting to allow only non-stop orders for trains and road vehicles.
  • Go to depot and sell vehicle orders.
  • Order mode to lock timetable wait and travel times against autofill/automate changes.
  • Leave early and leave early if any/all cargoes fully loaded order timetable flags.
  • Timetabled wait times at waypoints.
  • Add warning/info messages to the timetable window.
  • Add features to reverse the order of an order list, and to append the reverse of an order list.
    (Use the ctrl key when the end of orders marker is selected, or enable the order management button).
  • Add features to duplicate an individual order and to change the jump target of conditional orders.
  • Add company setting for whether to advance the current order when cloning/copying/sharing (if current depot is in order list).
  • Add vehicle list menu item to mass cancel go to or service at depot orders.
Stations
  • Departure boards.
  • Add road waypoints.
  • Add NewGRF road stops.
  • Add a setting to increase the station catchment radius.
  • Station rating: track "last visited vehicle type" separately per cargo.
  • Add setting to scale station cargo capacity and rating tolerance by size.
  • Add setting: station rating tolerance to waiting time depends on cargo class.
  • Enable vehicle list buttons in station window when the list would be non-empty.
  • Enable vehicle group management actions on other companies' stations.
  • Add support for allowing/disallowing supply to a station, per cargo, by ctrl-clicking the station cargo rating.
  • Add setting to show a company-coloured mark next to vehicles in vehicle list windows, if their owner does not match the list owner.
  • Add a waiting cargo history graph for stations.
  • Add a tooltip to show station rating details (controlled by a setting).
  • Add sort by number of vehicles calling to the station list window.
  • Add setting to distribute cargo received at a station to all accepting industries equally, instead of just one of them.
  • Add setting to allow hiding viewport labels of individual waypoints.
  • Increase the distance a station can be from the town centre and still be assigned have the same name as the town (no suffix/prefix), for large towns.
  • Allow NewGRFs to supply additional station name strings.
  • Allow generating new default name for station (ctrl-click default button in rename station query window).
  • Allow exchanging a station's name with another station in the same town.
Towns
  • Town cargo generation factor.
  • Rating in town label.
  • Random town road reconstruction. This defaults to off.
  • Add very and extremely slow options to town growth rate setting.
  • Add a setting to scale town growth rate by proportion of town cargo transported.
  • Add "indifferent" mode to the town council attitude to area restructuring setting.
  • Disallow converting town-owned roads to types with the no houses flag.
  • Add public roads (road network automatically built between towns) at map generation and in the scenario editor.
  • Add settings for if/when towns can build road bridges and tunnels.
  • Add setting to limit length of continuous inclined roads built by towns.
  • Add setting for whether to allow converting town road to non-house types.
  • Allow overriding town road construction settings and whether town growth is enabled on a per-town basis, add setting to enable this for multiplayer clients.
  • Allow NewGRFs to set town zone radii.
  • Show town count in town directory window.
Industries
  • Industry cargo generation factor.
  • Allow linking only inputs or outputs to the smallmap and map mode viewports in the industry chain window.
Map and Landscaping
  • Add a setting to reduce or stop the tree growth rate.
  • Adjusted arctic tree placement.
  • Add a new tree placement mode with improved distribution.
  • Minimum town distance.
  • Add map generation settings to control river/lake, rocky patch, and tropic zone generation.
  • Add generation of wide rivers.
  • Add settings to customise the size of town zones, and city zones.
Construction
  • Enable building rivers in game. Off by default.
  • Add a setting to disable removing sea/rivers.
  • Allow building objects by area (1x1 objects only).
  • Allow purchasing a region of tiles at once, by dragging.
  • Add setting to control if and how land purchasing is permitted.
  • Add a company rate limit for land purchasing.
  • Add a company rate limit for object construction.
  • Add setting to disable object expiry after a given year.
  • Add setting to ignore object introduction dates.
  • Add setting for whether to confirm before demolishing industries and/or rail stations.
  • Add picker tool for objects, rail types, road types, rail stations/waypoint, road stops/waypoints and signals, to the main toolbar help menu.
Scenario EditorInterface and Visuals
  • Zoning.
  • Measurement tools.
  • Enhanced viewport.
    Extra zoomed-out zoom levels with different map display modes (page up/down or ctrl-mousewheel).
    Selected vehicle order overlays.
    Industry tooltips.
    Plans (useful in multiplayer).
  • Add setting for shading trees on slopes in viewports (default on).
  • Add setting for alternative linkgraph overlay colour schemes.
  • When building tunnels, open new viewports at the far end of the tunnel.
  • Smallmap screenshots.
  • Whole map screenshots at current zoom level.
  • Topography and industry screenshots.
  • Make minimap refresh period variable with map mode/zoom and pause state.
  • Add display setting for income/cost text effects.
  • Make the company infrastructure window scrollable.
  • Add setting to disable water animation depending on zoom level.
  • Add zoom in support to the minimap window.
  • Add setting to increase the size of the main toolbar.
  • Add cargo filtering and a show by cargo mode to the company delivered cargo graph.
  • Add setting to display the area outside of the map as water.
Limits
  • Extra large maps.
    Maximum map size is now 256M tiles, ranging from 16k x 16k to 256 x 1M.
  • Increase the limit of NewGRF house IDs in a single game from 512 to 1024.
  • Increase per-vehicle order limit from 254 to 64k.
  • Increase maximum setting limits for per-company vehicle-type limits.
  • Increase maximum permitted vehicle, group, depot and station/waypoint name lengths.
  • Increase maximum permitted rail waypoint types from 256 to 64k.
Time and Date
  • Variable day length.
  • Add settings to show time in hours and minutes as well as or instead of days.
Multiplayer
  • Infrastructure sharing
  • Add company settings to enable competitors to buy/renew vehicles in this company's depots.
  • Add setting to control whether trains can crash with trains owned by other companies.
  • Give money to company, instead of player, broadcast money transfer notifications to all players.
  • Add setting to enable non-admin multiplayer clients to rename towns.
  • Add a password mechanism to change network game settings from a network client.
  • Auto-kick clients after too many failed rcon/settings attempts.
  • Various changes to reduce the probability of desyncs and improve desync reporting/diagnostics.
  • Add support for zstd savegame compression for autosaves and network joins.
  • Increase the number of settings which can be changed in multiplayer.
  • Store company passwords in network server saves in an encrypted form such that they are automatically restored when loaded into the same network server.
  • Add client setting for whether to sync localisation settings (such as measurement units) with the server.
Money
  • Add setting to control dates over which inflation is applied.
  • Allow shift-clicking on borrow/repay money buttons to enter a quantity.
  • Add mode to the cargo payment graph to show payment based on average transit speed.
Cheats
  • Add support for server admin use of money, magic bulldozer, tunnels and jet crashes cheats in multiplayer.
  • Add setting to allow non server admins to use the money cheat in multiplayer.
  • Allow clicking the money text in the cheats window to enter a quantity.
  • Add cheats to set inflation income and cost factors.
  • Add cheat to set all station ratings to 100%.
  • Add cheat to set all town local authority ratings to Outstanding.
Cargo Distribution and Link Graph
  • Adjust link graph job scheduling algorithm to significantly improve responsiveness and prevent pausing.
  • Improve scrolling rendering of link graph overlay on viewport and small map.
  • Add new link graph distribution modes: asymmetric (equal) and asymmetric (nearest).
  • Allow overriding distribution mode on a per-cargo basis, in game.
  • Fix inaccurate cargo distribution and link graph overlays, and various other problems with large link graphs.
  • Add setting to increase the cargodist link graph distance/cost metric of aircraft links.
Input
  • Add modifier key window for toggling shift/ctrl key states using mouse.
  • Add IME support on Linux/SDL2 (SDL2-supported IMEs and Fcitx).
Console and Scripts
  • Add basic tab-completion to the console window.
  • Add console commands for conditional execution from game date.
  • Daily/monthly/yearly scripts
Miscellaneous
  • Pause on savegame load if ctrl key is pressed.
  • Ctrl-click up/down in NewGRF window to move to top or bottom.
  • Add setting for when to ask for confirmation before overwriting an existing savegame file, add unique ID to savegames.
  • Allow setting the autosave interval to a custom number of in-game days or real-time minutes.
  • Add more hotkeys.
  • Allow AI/GS developers to reload GSs.
  • Various extensions to the NewGRF developer debug tools.
  • Various performance improvements.
  • Various minor fixes, see changelog.
  • NewGRF specification additions.
  • NML specification additions.
  • AI/GS script additions.
  • Low-level code/performance changes.
Translations
  • German (by Auge and Kruemelchen)
  • Korean (by kiwitreekor and TELK)
  • Japanese (by Qwerty Asd)
Suggestions for additions and changes to the list are welcome, but please check existing suggestions in the thread first.

Window, Linux, Mac binaries:
Builds can be found on Github.

Source:
The source is on GitHub. Some features/patches have their own branch(es).
(A SVN-style diff is no longer provided, please use git/GitHub to acquire the source).

Previous releases:
Source and binary zips for previous (and the current) releases are also on GitHub.
Subscribe to the Github release RSS feed to get release announcements.

Patch boilerplate:
This is not an official OpenTTD release, therefore bug reports, suggestions, questions and so on should be posted in this thread, or to this patchpack's GitHub.
As currently implemented, savegames created using this patch pack will not be loadable on trunk versions or other patched versions.
(Nearly all of the patches which are listed above have been modified, fixed or extended in some way, and so are not the same as the originals which are linked).

Caveats for loading savegames from the Spring 2013 Patch Pack:
  • Savegames with huge airports are rejected.
  • Map sizes greater than 16k x 16k are rejected.
  • PAX signals/stations and traffic lights are cleared, leaving ordinary signals/stations/roads.
  • Rail ageing/grass on tracks, trip histories, leave order/wait for cargo, auto advertising campaigns, base cost multiplies and other features not in this patch pack are dropped/ignored.
  • SpringPP v2.0.102/103 only:
    • Savegames which have aircraft approaching, landing, taking off or landed at an oil rig are rejected
    • The inflation cost multiplier is adjusted on load
  • This is not guaranteed to be bug free.
Caveats for loading savegames from Joker's Patch Pack:
  • Logic signals are cleared, leaving ordinary signals.
  • Various vehicle separation settings and partially-automatic modes are not supported.
  • Rail ageing/grass on tracks, trip histories, waiting cargo histories, station cargo punishment and other features not in this patch pack are dropped/ignored.
  • This is not guaranteed to be bug free.
Caveats for loading savegames from Chill's Patch Pack:
  • Speed signals are cleared, leaving ordinary signals.
  • Various vehicle, economy, town and other settings are not supported.
  • Link graph data (but not settings) is cleared.
  • Train stuck counters, traffic lights and other features not in this patch pack are dropped/ignored.
  • This is not guaranteed to be bug free.
See the change log for details of what has been added or changed in each release.
Last edited by JGR on 02 Mar 2024 12:59, edited 183 times in total.
Ex TTDPatch Coder
Patch Pack, Github
User avatar
ISA
Tycoon
Tycoon
Posts: 3384
Joined: 17 Oct 2005 20:56
Location: Estonia

Re: JGR's Patch Pack

Post by ISA »

Very nice!

Out of interest from another thread... Should I just replace my original files with these what are in the openttd-custom-jgrpp-0.1-MINGW.zip file? or I should do something else?
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

ISA wrote:Very nice!

Out of interest from another thread... Should I just replace my original files with these what are in the openttd-custom-jgrpp-0.1-MINGW.zip file? or I should do something else?
If you want to replace an existing installation you can do that, otherwise you can unzip it somewhere else and run it from there.
I'd generally suggest having parallel installations unless you're really sure that you won't need the one you have already.
Ex TTDPatch Coder
Patch Pack, Github
User avatar
ISA
Tycoon
Tycoon
Posts: 3384
Joined: 17 Oct 2005 20:56
Location: Estonia

Re: JGR's Patch Pack

Post by ISA »

JGR wrote:
ISA wrote:Very nice!

Out of interest from another thread... Should I just replace my original files with these what are in the openttd-custom-jgrpp-0.1-MINGW.zip file? or I should do something else?
If you want to replace an existing installation you can do that, otherwise you can unzip it somewhere else and run it from there.
I'd generally suggest having parallel installations unless you're really sure that you won't need the one you have already.
Yes that's the other way what I was thinking. Just wanted to be clear as possible with my question. Thanks mate I give it a go!

EDIT: I got a error "Cant open file 'progsignal.grf' Game window opens, but just before the main title screen the error occurs.
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

ISA wrote:
JGR wrote:
ISA wrote:Very nice!

Out of interest from another thread... Should I just replace my original files with these what are in the openttd-custom-jgrpp-0.1-MINGW.zip file? or I should do something else?
If you want to replace an existing installation you can do that, otherwise you can unzip it somewhere else and run it from there.
I'd generally suggest having parallel installations unless you're really sure that you won't need the one you have already.
Yes that's the other way what I was thinking. Just wanted to be clear as possible with my question. Thanks mate I give it a go!

EDIT: I got a error "Cant open file 'progsignal.grf' Game window opens, but just before the main title screen the error occurs.
I forgot to add the extra GRFs to the bundle zip. Can you download and unpack the bundle again?
Ex TTDPatch Coder
Patch Pack, Github
User avatar
ISA
Tycoon
Tycoon
Posts: 3384
Joined: 17 Oct 2005 20:56
Location: Estonia

Re: JGR's Patch Pack

Post by ISA »

Its now up and running! Thanks again!
Now I need get use to it (patch) :)


EDIT: Got a crash! (picture below). I was in advance settings and I clicked on "Company" drop down menu when the error hit me.

LOG:Just wondering why we cant add txt files into attachment area?
*** OpenTTD Crash Report ***

Crash at: Sat Aug 15 21:52:10 2015
In game date: 2009-05-25 (51)

Crash reason:
Exception: E1212012
Location: 74C4C42D
Message: Assertion failed at line 59 of /home/jgr/openttd/trunk-testing/src/strings_func.h: size <= parent.GetDataLeft()

OpenTTD version:
Version: jgrpp-0.1 (0)
NewGRF ver: 16006afa
Bits: 32
Endian: little
Dedicated: no
Build date: Aug 15 2015 11:21:43

Registers:
EAX: 0028B9E4 EBX: 00000016 ECX: 00000000 EDX: 0008E3C8
ESI: 75453180 EDI: 00000000 EBP: 0028BA34 ESP: 0028B9E4
EIP: 74C4C42D EFLAGS: 00000246

Bytes at instruction pointer:
C9 C2 10 00 CC CC CC CC CC 8B FF 55 8B EC 56 8B 75 08 83 FE F4 72 18 83

Stack trace:
E1212012 00000000 00000000 74C4C42D 00000000 0028BA18 76A4FCF1 01AE08F2
754564A8 754003E0 00012010 00000000 FFFFFFFF 0028BA34 76A4FD36 01AE08F2
76EFFB36 76F19C5E FFFFFFFF 00000024 0028BAA0 0056DED8 E1212012 00000000
00000000 00000000 75450290 0028BAA0 75415E89 75415E8F 00000016 85066B61
296A4B74 00EB2E98 0028BDF0 76EFFB36 76F1915C 00000000 00000024 0056DEB0
00000001 0028BA60 0028B40C 0028FFC4 753D8CD5 F06F8F79 FFFFFFFE 0028BDD8
75418EA2 00000016 00EB2E98 009207F8 012AAC78 012C29D8 000B0020 0000002D
00000000 0100025B 00000000 00000168 01010000 0028BA10 76A1CF5C 0028FFC4
76F51A05 2282A99E FFFFFFFE 76F138CA 76F134C2 00000000 012AAC78 00010003
00000000 0028BD1C 012AAC70 0028BBB8 76A4F774 01260000 00000000 012AAC78
00000001 0028BD1C 00000001 0000001C 0000000F 00000000 00E91C40 00000010
01AE08F2 00000000 00000006 00000000 00000000 00000780 00000410 00000000
00000142 0028BD1C 000002E8 00000000 00007F01 00000000 00000001 0000002D
50022080 00000035 00000020 00000000 00000000 000001AF 76F0E3CC 012AAC78
014E135C 00000000 012AACDC 014E13C8 000001B1 0028BD10 76A4FA18 00000010
296A4B74 00EB2E98 76A4FA50 00000001 0028BCC0 00000000 009A0098 0028BCC0
00000000 014E0E04 76F0E1F2 76F1F9DE 545ADDA2 00000000 00000000 76A4FA6C
00000000 00000001 753CAA42 00361BE0 00ADD6F9 00000016 00000016 7FFFFFFF
00000000 75452BD0 00361548 753BA53A 00000000 0028BC68 753CA8C1 00361BE0
00ADD6F9 00000016 0028BC58 7FFFFFFF 00000000 75452BD0 00361548 003607D0
00000000 0028BC98 753CA9C8 0000000A 00000005 00000005 00000005 003617B8
00361BE1 75452BD0 00000005 00000000 0028BCB1 0028BCB0 0074E20D 00000005
00000000 0000000A 00000000 00283539 00000020 00000017 0074E056 0028BCCC
753BA442 75450090 0028BD08 FFFFFFFF 0000007F 0028BDF0 00E91C40 00000200

Operating system:
Name: Windows
Release: 6.1.7601 (Service Pack 1)
Compiler: GCC 4.9.2 "4.9.2"

Configuration:
Blitter: 32bpp-anim
Graphics set: OpenGFX (1002)
Language: F:\OpenTTDJGRPatchPack\lang\english_US.lng
Music driver: win32
Music set: OpenMSX (96)
Network: no
Sound driver: win32
Sound set: OpenSFX (87)
Video driver: win32

Fonts:
Small: sprite
Medium: sprite
Large: sprite
Mono: sprite

AI Configuration (local: 0):
0: Human

Libraries:
FreeType: 2.6.0
LZMA: 5.2.1
LZO: 2.09
PNG: 1.5.23
Zlib: 1.2.8

Module information:
F:\OpenTTDJGRPatchPack\openttd.exe handle: 00400000 size: 12418344 crc: E09AA67A date: 2015-08-15 10:23:04
C:\Windows\SysWOW64\ntdll.dll handle: 76ee0000 size: 1310744 crc: B9EAA7F9 date: 2015-05-25 18:04:08
C:\Windows\syswow64\kernel32.dll handle: 74a90000 size: 1114112 crc: F1F85B3C date: 2015-05-25 17:59:51
C:\Windows\syswow64\KERNELBASE.dll handle: 74c40000 size: 274944 crc: 61A5D432 date: 2015-05-25 17:59:51
C:\Windows\syswow64\ADVAPI32.dll handle: 76830000 size: 641536 crc: 0E9C4CAC date: 2015-05-25 18:01:17
C:\Windows\syswow64\msvcrt.dll handle: 753b0000 size: 690688 crc: DAB48B3A date: 2011-12-16 07:52:58
C:\Windows\SysWOW64\sechost.dll handle: 76790000 size: 92160 crc: 80F53C42 date: 2015-05-25 18:01:39
C:\Windows\syswow64\RPCRT4.dll handle: 768e0000 size: 665088 crc: 6886BB79 date: 2015-07-01 20:29:34
C:\Windows\syswow64\SspiCli.dll handle: 74850000 size: 96768 crc: BF67A19C date: 2015-07-01 20:29:34
C:\Windows\syswow64\CRYPTBASE.dll handle: 74840000 size: 36864 crc: A92230B4 date: 2015-07-01 20:30:21
C:\Windows\syswow64\GDI32.dll handle: 74ba0000 size: 312320 crc: 29E30B87 date: 2015-06-17 17:37:03
C:\Windows\syswow64\USER32.dll handle: 769e0000 size: 833024 crc: 9EFE504D date: 2010-11-21 03:24:20
C:\Windows\syswow64\LPK.dll handle: 769d0000 size: 25600 crc: 7BD70336 date: 2015-07-15 02:54:33
C:\Windows\syswow64\USP10.dll handle: 74ed0000 size: 626688 crc: 7CF1A954 date: 2014-04-25 02:06:17
C:\Windows\syswow64\IMM32.DLL handle: 75350000 size: 119808 crc: 38DB5163 date: 2010-11-21 03:24:25
C:\Windows\syswow64\MSCTF.dll handle: 74f70000 size: 828928 crc: 9CA6751F date: 2015-01-17 02:30:42
C:\Windows\syswow64\SHELL32.DLL handle: 755c0000 size: 12875264 crc: 3110B5FC date: 2015-02-13 05:26:18
C:\Windows\syswow64\SHLWAPI.dll handle: 764e0000 size: 350208 crc: 23E05F73 date: 2010-11-21 03:23:48
C:\Windows\system32\WINMM.DLL handle: 71930000 size: 194048 crc: 849223C7 date: 2010-11-21 03:24:16
C:\Windows\syswow64\WS2_32.dll handle: 76430000 size: 206848 crc: FD00A753 date: 2010-11-21 03:23:55
C:\Windows\syswow64\NSI.dll handle: 76400000 size: 8704 crc: 2ACE9671 date: 2009-07-14 01:16:11
C:\Windows\syswow64\ole32.dll handle: 75460000 size: 1414656 crc: 1053E386 date: 2015-07-04 17:48:36
C:\Windows\system32\uxtheme.dll handle: 72ef0000 size: 245760 crc: 60C5C746 date: 2009-07-14 01:11:24
C:\Windows\system32\dwmapi.dll handle: 72ed0000 size: 67584 crc: 5724323D date: 2015-03-14 03:04:46
C:\Windows\syswow64\CLBCatQ.DLL handle: 750b0000 size: 522240 crc: 6C130B8A date: 2009-07-14 01:15:03
C:\Windows\syswow64\OLEAUT32.dll handle: 74c90000 size: 571904 crc: 0EB7703D date: 2014-11-26 03:32:05
C:\Windows\system32\mswsock.dll handle: 73310000 size: 231424 crc: 2A2905A9 date: 2013-09-08 02:03:58
C:\Windows\System32\wshtcpip.dll handle: 73300000 size: 9216 crc: BA963A19 date: 2009-07-14 01:16:20
C:\Windows\system32\MMDevAPI.DLL handle: 718f0000 size: 213504 crc: 93C0AA4F date: 2010-11-21 03:23:51
C:\Windows\system32\PROPSYS.dll handle: 73b20000 size: 988160 crc: 888D0BCB date: 2010-11-21 03:24:08
C:\Windows\system32\wdmaud.drv handle: 6b4c0000 size: 172032 crc: D5B9F5FA date: 2010-11-21 03:24:00
C:\Windows\system32\ksuser.dll handle: 718d0000 size: 4608 crc: EBE07232 date: 2009-07-14 01:15:35
C:\Windows\system32\AVRT.dll handle: 70c80000 size: 14336 crc: 9818237B date: 2009-07-14 01:14:58
C:\Windows\syswow64\SETUPAPI.dll handle: 75140000 size: 1667584 crc: 1D0104E8 date: 2010-11-21 03:23:51
C:\Windows\syswow64\CFGMGR32.dll handle: 74e70000 size: 145920 crc: 377B5190 date: 2011-05-24 10:39:38
C:\Windows\syswow64\DEVOBJ.dll handle: 75330000 size: 64512 crc: 66B02A5A date: 2011-05-24 10:40:05
C:\Windows\system32\AUDIOSES.DLL handle: 71470000 size: 195584 crc: 4831E850 date: 2015-02-03 03:12:12
C:\Windows\system32\msacm32.drv handle: 70920000 size: 20992 crc: 73923147 date: 2009-07-14 01:14:08
C:\Windows\system32\MSACM32.dll handle: 71d10000 size: 72192 crc: ABA25814 date: 2009-07-14 01:15:42
C:\Windows\system32\midimap.dll handle: 6df60000 size: 16896 crc: C000494C date: 2009-07-14 01:15:40
C:\Windows\syswow64\psapi.dll handle: 752f0000 size: 6144 crc: 25B988F9 date: 2009-07-14 01:16:12

---- gamelog start ----
Tick 0: new game started
Revision text changed to r26844, savegame version 193, not modified, _openttd_newgrf_version = 0x150068dc
New game mode: 1 landscape: 0
Added NewGRF: GRF ID 4E480101, checksum A75AEB1758966FB8CA8B0D7044B5C0A8, filename: nhfoundationsw.grf (md5sum matches)
Added NewGRF: GRF ID 4A430002, checksum 237EC8B4432F26C2721B69D0814045E6, filename: indstatr.grf (matches GRFID only)
Added NewGRF: GRF ID F1250005, checksum 574836B24595A99523DC3CFDC936C1C5, filename: firs.grf (matches GRFID only)
Added NewGRF: GRF ID 4D50003F, checksum 1DE407E8A75704008414044459D18E16, filename: ISRfencew.grf (md5sum matches)
Added NewGRF: GRF ID 6D620401, checksum C5ACB6D5536A464FD78871D91840A35F, filename: dbsetxlw.grf (md5sum matches)
Added NewGRF: GRF ID 6D620403, checksum 088F2C57616F12A732A3025F5E997F80, filename: dbxl_firs.grf (md5sum matches)
Added NewGRF: GRF ID 44550001, checksum A383C2108661E1840A6FD23F5D8957DD, filename: germanrvw.grf (matches GRFID only)
Added NewGRF: GRF ID 42010000, checksum 6FE46BEACFA8B4191B9F8FEAEFBE819F, filename: gersignw.grf (md5sum matches)
Added NewGRF: GRF ID 44573553, checksum CB054F670BDBCF6CE57FB7F37D7EF5FE, filename: dwe_newobj.grf (md5sum matches)
Added NewGRF: GRF ID 44573452, checksum 39A1EB2C5FE2AD2164C807DDE631B3DD, filename: dwe_stat_r.grf (matches GRFID only)
Added NewGRF: GRF ID 4D656F17, checksum 8A4F8A04256C90BECF818D134C91C816, filename: 4LVw.grf (md5sum matches)
Added NewGRF: GRF ID 414E0201, checksum 0AE10AAC0C43918147FB411CD4D712EB, filename: fish.grf (matches GRFID only)
Added NewGRF: GRF ID 41501202, checksum 1B96AB1BA5AE3C403C4C664EDFF2C1BE, filename: heqs.grf (matches GRFID only)
Added NewGRF: GRF ID 4946424C, checksum 277B92187F074918F46CE65FD6D440EC, filename: hotairballoon.grf (md5sum matches)
Added NewGRF: GRF ID 44503000, checksum C16D1EFB187C98410B162C971A397CE8, filename: jptracks.grf (md5sum matches)
Added NewGRF: GRF ID 6D620C00, checksum C79E400CDDAF4610BC8613199D08933E, filename: marico.grf (md5sum matches)
Added NewGRF: GRF ID 44450004, checksum D173807A8A9A8A591552C3BC35E9FBEB, filename: mlss052.grf (md5sum matches)
Added NewGRF: GRF ID 4672780A, checksum B4E2FB43C2CCD3E26F4524E45DFEE4AF, filename: monkeybarbridge.grf (md5sum matches)
Added NewGRF: GRF ID 6D620004, checksum 70649F1AFC954942173B0AA89C1E8B14, filename: newshipsw.grf (md5sum matches)
Added NewGRF: GRF ID 6D620601, checksum 537A2B9E5F0644BC360248B2B802D086, filename: newstats.grf (md5sum matches)
Added NewGRF: GRF ID 4F472B34, checksum DD8430D9CAFECEB7830DDBF92A1C2B0B, filename: ogfx-landscape.grf (matches GRFID only)
Added NewGRF: GRF ID 47541003, checksum 20CF2D86E0CF5ED3465A1C9BE3285957, filename: rusplanesottd.grf (md5sum matches)
Added NewGRF: GRF ID 49464E4F, checksum BAC22546C151037276AA7775F17AB3A9, filename: SNO-Supercheese'sNewObjects.grf (md5sum matches)
Added NewGRF: GRF ID 504A0105, checksum CE85335D194874E2743ED938E2C825C1, filename: ISRoverlap.grf (md5sum matches)
Added NewGRF: GRF ID 504A0106, checksum 45F465A20FB7A43EFA2E6D4E1A70A42B, filename: ISR_objects_v1_4.grf (md5sum matches)
Added NewGRF: GRF ID 53430101, checksum B62CFBA0EBF356B0E27ECCA89366464C, filename: sacsobjects1w.grf (md5sum matches)
Added NewGRF: GRF ID 4D4D9910, checksum B692C8F66B0AF0346067E8A9FAF3660E, filename: the_lighthouse_set_v1.0.grf (md5sum matches)
Added NewGRF: GRF ID 41533031, checksum F3A0A556505B7A94733D85B892C2070C, filename: swehouses.grf (md5sum matches)
Added NewGRF: GRF ID 56430001, checksum 2B67D5836DDFE0E2CC2454E1540A85F2, filename: ttrs3w.grf (md5sum matches)
Added NewGRF: GRF ID 52453400, checksum A137F69178047E05260C7E886A689E1D, filename: jpbuild.grf (md5sum matches)
Added NewGRF: GRF ID 57A50001, checksum 318F3C3F17CA68EAD533BAC88B093094, filename: was.grf (md5sum matches)
Added NewGRF: GRF ID 415A0101, checksum 9BFBC924B18D42D7F564E7CD6237981D, filename: wsfferryset.grf (md5sum matches)
Added NewGRF: GRF ID 415A0701, checksum AFFD2D15EA23F8A95A50EA5FDFC4D84E, filename: arrs_objects.grf (md5sum matches)
Added NewGRF: GRF ID 44440A01, checksum FCEEC76CF44EC23E7FE9C88048CF11CC, filename: pb_av8w.grf (md5sum matches)
Added NewGRF: GRF ID 50530401, checksum 5EB6D48B4715F3F2733A5C702D4CAA69, unknown GRF
Added NewGRF: GRF ID 4A5A0301, checksum 70927A4333FE2B2F62FC03C570163E76, filename: fakeapV2.grf (md5sum matches)
Added NewGRF: GRF ID FBFB0102, checksum B8D83E093D8BDB400B1CD0555E747C33, filename: dutchtramset.grf (md5sum matches)
Added NewGRF: GRF ID 46727800, checksum 3B58B9177D1A1B54D356F64B93526116, filename: SMITS.grf (md5sum matches)
Added NewGRF: GRF ID 46727803, checksum 3A011F33641913D8520C3CF9833D6947, filename: shanghaitransrapid.grf (md5sum matches)
Added NewGRF: GRF ID 24251D2C, checksum D651DD34D8F6F27712B309A693860859, filename: Hungarian Truck Set 0.3l.GRF (md5sum matches)
Tick 1280: GRF config changed
Added NewGRF: GRF ID 44508550, checksum D779074A639801344D5D7CAEE4990D6C, filename: SBBset.grf (md5sum matches)
Tick 1280: GRF config changed
GRF parameter changed: GRF ID 44503000, filename: jptracks.grf (md5sum matches)
Tick 15582: GRF config changed
Added NewGRF: GRF ID 74677462, checksum 2A7BF147645EFB9565FD6535B619E784, filename: jpbridges.grf (md5sum matches)
Tick 15582: GRF config changed
GRF order changed: 74677462 moved 10 places downGRF ID 74677462, filename: jpbridges.grf (md5sum matches)
Added NewGRF: GRF ID 74677462, checksum E2B89B35B6CC3F9A464B36DC7CA7CD0D, filename: total_bridges_nar.grf (md5sum matches). Gamelog inconsistency: GrfID was already added!
Tick 15582: GRF config changed
GRF parameter changed: GRF ID 56430001, filename: ttrs3w.grf (md5sum matches)
Tick 18667: GRF config changed
GRF parameter changed: GRF ID 56430001, filename: ttrs3w.grf (md5sum matches)
Tick 27084: settings changed
Setting changed: vehicle.plane_speed : 4 -> 3
Tick 27091: settings changed
Setting changed: vehicle.plane_speed : 3 -> 2
Tick 27111: settings changed
Setting changed: vehicle.plane_speed : 2 -> 1
Tick 27613: settings changed
Setting changed: station.never_expire_airports : 0 -> 1
Tick 42010: GRF config changed
GRF order changed: 6D620601 moved 19 places upGRF ID 6D620601, filename: newstats.grf (md5sum matches)
GRF order changed: F1250005 moved 2 places downGRF ID F1250005, filename: firs.grf (matches GRFID only)
Added NewGRF: GRF ID 4D50006A, checksum 75A9885D1A6494759243A60B434E9552, filename: iorestat.grf (md5sum matches)
Tick 25981: GRF config changed
Added NewGRF: GRF ID 9787EA81, checksum 344D22B14325AA88CA1D7B1272C1A7AC, filename: CanStn.grf (md5sum matches)
Tick 15339: GRF config changed
GRF parameter changed: GRF ID 4A430002, filename: indstatr.grf (matches GRFID only)
Tick 15339: GRF config changed
GRF order changed: 6D620601 moved 1 places downGRF ID 6D620601, filename: newstats.grf (md5sum matches)
Tick 15339: GRF config changed
GRF order changed: 6D620601 moved 1 places downGRF ID 6D620601, filename: newstats.grf (md5sum matches)
Tick 15339: GRF config changed
GRF parameter changed: GRF ID 4A430002, filename: indstatr.grf (matches GRFID only)
Tick 14229: GRF config changed
GRF parameter changed: GRF ID 9787EA81, filename: CanStn.grf (md5sum matches)
Tick 60239: game loaded
Missing NewGRF: GRF ID F1250005, filename: firs.grf (matches GRFID only)
Tick 60239: GRF config changed
Added NewGRF: GRF ID F1250005, checksum 61579C2EF19209EEAE3416B4F9263D5E, filename: firs.grf (matches GRFID only)
Tick 11376: GRF config changed
Compatible NewGRF loaded: GRF ID 74677462, checksum 96C5D349E24E8078555F42EFAAC3124E, filename: total_bridges_TTRS3.grf (md5sum matches)
Tick 11376: GRF config changed
GRF parameter changed: GRF ID 4E480101, filename: nhfoundationsw.grf (md5sum matches)
Tick 11376: GRF config changed
GRF parameter changed: GRF ID 4E480101, filename: nhfoundationsw.grf (md5sum matches)
Tick 11376: GRF config changed
GRF order changed: 4E480101 moved 32 places downGRF ID 4E480101, filename: nhfoundationsw.grf (md5sum matches)
Tick 17828: game loaded
Revision text changed to r27077, savegame version 194, not modified, _openttd_newgrf_version = 0x150069c5
Tick 21046: GRF config changed
GRF parameter changed: GRF ID 41533031, filename: swehouses.grf (md5sum matches)
Tick 5998: GRF config changed
Added NewGRF: GRF ID 43415000, checksum 4DA9FE9A87DD330EBAD43916771BAF21, filename: ogfx-airports.grf (md5sum matches)
Added NewGRF: GRF ID 54470203, checksum F84B6D37659F23D19E176C99BC48DEF6, filename: airportobjects.grf (md5sum matches)
Tick 5998: GRF config changed
Removed NewGRF: GRF ID 9787EA81, filename: CanStn.grf (md5sum matches)
Tick 51321: game loaded
Compatible NewGRF loaded: GRF ID 4A430002, checksum 93EAC5F5396584B92D4C5F0AAAF3F6C5, filename: indstatr.grf (md5sum matches)
Tick 57081: GRF config changed
GRF parameter changed: GRF ID 6D620C00, filename: marico.grf (md5sum matches)
Tick 57081: GRF config changed
GRF order changed: 6D620C00 moved 17 places upGRF ID 6D620C00, filename: marico.grf (md5sum matches)
Tick 60571: game loaded
Compatible NewGRF loaded: GRF ID 4F472B34, checksum D391F0A86BBE443111CEFB1A3972A233, filename: ogfx-landscape.grf (matches GRFID only)
Tick 58387: GRF config changed
Added NewGRF: GRF ID 53541101, checksum ECB758CAF23442BC55A0976A3EEEF1DB, filename: infra_streets1x1_p1.grf (md5sum matches)
Added NewGRF: GRF ID 53541119, checksum 2DB55BAA1D2B2538D5C7B5BA9AEE4CB9, filename: infra_streets1x1_p2.grf (md5sum matches)
Added NewGRF: GRF ID 53541129, checksum 4E54EB92FBD36275FE8DFEE4E328A782, filename: infra_streets1x1_p3.grf (md5sum matches)
Tick 58387: GRF config changed
GRF order changed: 53541101 moved 34 places upGRF ID 53541101, filename: infra_streets1x1_p1.grf (md5sum matches)
GRF order changed: 53541119 moved 35 places upGRF ID 53541119, filename: infra_streets1x1_p2.grf (md5sum matches)
GRF order changed: 53541129 moved 36 places upGRF ID 53541129, filename: infra_streets1x1_p3.grf (md5sum matches)
Removed NewGRF: GRF ID 53541101, filename: infra_streets1x1_p1.grf (md5sum matches)
Removed NewGRF: GRF ID 53541119, filename: infra_streets1x1_p2.grf (md5sum matches)
Removed NewGRF: GRF ID 53541129, filename: infra_streets1x1_p3.grf (md5sum matches)
Tick 17053: GRF config changed
Removed NewGRF: GRF ID 4A5A0301, filename: fakeapV2.grf (md5sum matches)
Tick 60526: GRF config changed
Added NewGRF: GRF ID 53441101, checksum 3E2397532428AB013862B22EDBB396E5, filename: infra_green1x1_p1.grf (md5sum matches)
Added NewGRF: GRF ID 53441119, checksum 4201D77058BC82C4F2DC0294AFBA6DC3, filename: infra_green1x1_p2.grf (md5sum matches)
Added NewGRF: GRF ID 53441129, checksum 9CF044DD9054F863295D5AA8A1671999, filename: infra_green1x1_p3.grf (md5sum matches)
Tick 17733: game loaded
Revision text changed to r27261, savegame version 194, not modified, _openttd_newgrf_version = 0x16006a7d
Compatible NewGRF loaded: GRF ID 4F472B34, checksum 00AF396CAF13DEAD1613749CDB1541EB, filename: ogfx-landscape.grf (md5sum matches)
Tick 17733: GRF config changed
Added NewGRF: GRF ID 504A0101, checksum E0D445CA409BC9FFC937F5A9E772D003, filename: seaplaneairport_v1_2.grf (md5sum matches)
Tick 17733: game loaded
Compatible NewGRF loaded: GRF ID F1250005, checksum 43DF754FDA276363086FCF25008F20D5, filename: firs.grf (md5sum matches)
Compatible NewGRF loaded: GRF ID 44550001, checksum 57CFF33C80D650C6317D31DCC45483C9, filename: germanrvw.grf (md5sum matches)
Missing NewGRF: GRF ID 44573452, filename: dwe_stat_r.grf (matches GRFID only)
Compatible NewGRF loaded: GRF ID 414E0201, checksum 2ADD4E518A1AD4C0CB82CC30623B2CFF, filename: fish.grf (md5sum matches)
Compatible NewGRF loaded: GRF ID 41501202, checksum B13DD8FB0D7C34CACAC2FE68BD137BB9, filename: heqs.grf (md5sum matches)
Missing NewGRF: GRF ID 50530401, unknown GRF
Tick 17733: GRF config changed
Added NewGRF: GRF ID 44578619, checksum B30A5E35634A59D2BDD9C2389CEDBF2C, unknown GRF
Tick 17733: GRF config changed
Added NewGRF: GRF ID 44573452, checksum 48CF5FC0DEB895136F337A7E563FC66D, filename: dwe_stat_r.grf (md5sum matches)
Tick 17733: GRF config changed
Removed NewGRF: GRF ID 44578619, unknown GRF
Tick 38001: GRF config changed
Added NewGRF: GRF ID 504A4641, checksum 457DE3A141B99D6BE258981C993B6761, filename: fakeairportobjects_v0_1.grf (md5sum matches)
Tick 55448: GRF config changed
Added NewGRF: GRF ID 48570101, checksum 2A1BF6BF856AA6DACD162703280E2029, filename: tars_mountain_lifts.grf (md5sum matches)
Tick 480: game loaded
Revision text changed to r27357, savegame version 194, not modified, _openttd_newgrf_version = 0x16006add
Tick 39673: game loaded
Revision text changed to jgrpp-0.1, savegame version 194, not modified, _openttd_newgrf_version = 0x16006afa
---- gamelog end ----

*** End of OpenTTD Crash Report ***
Attachments
aaa.png
aaa.png (14.35 KiB) Viewed 425861 times
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

ISA wrote:Its now up and running! Thanks again!
Now I need get use to it (patch) :)


EDIT: Got a crash! (picture below). I was in advance settings and I clicked on "Company" drop down menu when the error hit me.

LOG:Just wondering why we cant add txt files into attachment area?
Thanks for the report, this should be fixed now. See updated zip in the first post.
It seems that the improved breakdown patch inserted the string for its config setting into the middle of the string range for the values of the stop location setting.
Ex TTDPatch Coder
Patch Pack, Github
User avatar
ISA
Tycoon
Tycoon
Posts: 3384
Joined: 17 Oct 2005 20:56
Location: Estonia

Re: JGR's Patch Pack

Post by ISA »

Now its fixed and no more errors occurred! New signaling features are very fine, just needs a bit accustoming. Played some other patch feature also, no problem so far.
Also a suggestion. There were a patch where on the 'Map' window in one view all the different rail types were presented in different color. I just cant find it at the moment. If I do Ill post it.
User avatar
Comm Cody
Tycoon
Tycoon
Posts: 1060
Joined: 07 Mar 2008 22:21
Location: In a galaxy far far away.

Re: JGR's Patch Pack

Post by Comm Cody »

Now if there was only a way to merge this with Cirdan's map pack and HackABit tree line patch, I would have my dream OTTD build.
Something goes here, hell if I know.
User avatar
Valle
Transport Coordinator
Transport Coordinator
Posts: 284
Joined: 15 May 2007 11:35
Location: Germany

Re: JGR's Patch Pack

Post by Valle »

That list of patches sounds very promising to me, thank you for your efforts! Of course, I wanted to try it right away.

I tried to compile the source on Mac OS X Yosemite (10.10.4) without LZMA (I have the successor XZ, but it seems like that's not identified during the configuration.
Could somebody please have a look at the warnings and errors in the following log?

EDIT: Sorry, I just found a major error on my side. I lacked pkgconfig. Replacing the log found below with that of my current compilation if it also ends with an error.

EDIT 2: Log replaced, 5 errors are generated with pkgconfig as well.

Code: Select all

Last login: Sun Aug 16 15:28:51 on ttys002
Valentins-MacBook-Pro:~ Val$ cd /Users/Val/Downloads/OpenTTD-patches-jgrpp 
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ ./configure
checking awk... awk
detecting OS... OSX
checking build system type... x86_64-apple-darwin14.4.0
checking host system type... x86_64-apple-darwin14.4.0
checking universal build... no
checking build cc... gcc
checking host cc... gcc
checking build c++... g++
checking host c++... g++
checking strip... disabled
checking builtin depend... yes
checking makedepend... disabled
detecting cpu-type... 64 bits
detecting SSE... found
checking static... no
checking unicode... no
using debug level... no
using desync debug level... no
using link time optimization... no
checking OSX sysroot... no (use system default)
checking Allegro... OSX, skipping
checking SDL... OSX, skipping
checking COCOA... found
checking whether to enable the Quartz window subdriver... yes
checking Quickdraw window subdriver... disabled (64 bits)
checking GDI video driver... not Windows, skipping
checking dedicated... not selected
checking console application... not Windows, skipping
checking network... found
checking squirrel... found
checking translator... no
checking assert... enabled
checking zlib... found
checking liblzma... found
checking lzo2... found
checking libxdg-basedir... not found
checking libpng... found
checking freetype2... not found
checking libfontconfig... OSX, skipping
checking icu-lx... not found
checking icu-i18n... not found
checking psp-config... not PSP, skipping
checking libtimidity... not found
checking direct-music... not Windows, skipping
checking sort... sort
checking endianness... PREPROCESSOR
suppress language errors... no
checking stripping... skipped
checking distcc... no (only used when forced)
checking ccache... no (only used when forced)
checking grfcodec... not found
checking nforenum... not found
detecting ppc970 (G5)... no
checking revision... no detection
WARNING: there is no means to determine the version.
WARNING: please use a subversion, mercurial, or git checkout of OpenTTD.
WARNING: you can only join game servers that have been compiled without
WARNING:   version detection.
WARNING: there is a great chance you desync.
WARNING: USE WITH CAUTION!
checking iconv... found
checking if iconv has non-const inbuf... yes
checking whether to link to iconv... yes
personal home directory... Documents/OpenTTD
shared data directory... /Library/Application\ Support/OpenTTD
installation directory... /
icon theme directory... none
manual page directory... share/man/man6
menu item directory... none
clang: error: unsupported option '-dumpspecs'
clang: error: no input files
clang: error: unsupported option '-dumpspecs'
clang: error: no input files
using CFLAGS_BUILD...  -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -DOSX
using CXXFLAGS_BUILD... 
using LDFLAGS_BUILD... 
using CFLAGS...  -O2 -fomit-frame-pointer  -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -DOSX -DWITH_SSE -isystem/opt/local/include -DNO_QUICKTIME -mmacosx-version-min=10.5 -DUNIX -DWITH_COCOA -DENABLE_COCOA_QUARTZ -DWITH_ZLIB   -DWITH_LZMA -I/usr/local/Cellar/xz/5.2.1/include   -DWITH_LZO -D_SQ64 -I/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/3rdparty/squirrel/include -DWITH_PNG -I/usr/local/Cellar/libpng/1.6.17/include/libpng16   -DWITH_ICONV -DENABLE_NETWORK -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\"Documents/OpenTTD\" -DWITH_SHARED_DIR -DSHARED_DIR=\"/Library/Application\ Support/OpenTTD\" -DGLOBAL_DATA_DIR=\"/usr/local/share/games/openttd\"
using CXXFLAGS... 
using LDFLAGS... -lstdc++ -lc -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -L/usr/lib -lz   -L/usr/local/Cellar/xz/5.2.1/lib -llzma   -llzo2 -L/usr/local/Cellar/libpng/1.6.17/lib -lpng16   -liconv   -framework Cocoa
Generating Makefile...
Generating lang/Makefile...
Generating setting/Makefile...
Generating grf/Makefile...
Generating objs/Makefile...
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ make
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
make[1]: Nothing to be done for `all'.
[SRC] DEP CHECK (all files)
[SRC] Compiling 3rdparty/md5/md5.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdaux.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdmath.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqapi.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqbaselib.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqclass.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqcompiler.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqdebug.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqfuncstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqlexer.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqmem.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqobject.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqtable.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqvm.cpp
[SRC] Compiling ai/ai_config.cpp
[SRC] Compiling ai/ai_core.cpp
[SRC] Compiling ai/ai_gui.cpp
[SRC] Compiling ai/ai_info.cpp
[SRC] Compiling ai/ai_instance.cpp
[SRC] Compiling ai/ai_scanner.cpp
[SRC] Compiling aircraft_cmd.cpp
[SRC] Compiling aircraft_gui.cpp
[SRC] Compiling airport.cpp
[SRC] Compiling airport_gui.cpp
[SRC] Compiling animated_tile.cpp
[SRC] Compiling articulated_vehicles.cpp
[SRC] Compiling autoreplace.cpp
[SRC] Compiling autoreplace_cmd.cpp
[SRC] Compiling autoreplace_gui.cpp
[SRC] Compiling base_consist.cpp
[SRC] Compiling blitter/32bpp_anim.cpp
[SRC] Compiling blitter/32bpp_anim_sse4.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_anim_sse4.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_anim_sse4.hpp:26:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse4.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/32bpp_base.cpp
[SRC] Compiling blitter/32bpp_optimized.cpp
[SRC] Compiling blitter/32bpp_simple.cpp
[SRC] Compiling blitter/32bpp_sse2.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/32bpp_sse4.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse4.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse4.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/32bpp_ssse3.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/8bpp_base.cpp
[SRC] Compiling blitter/8bpp_optimized.cpp
[SRC] Compiling blitter/8bpp_simple.cpp
[SRC] Compiling blitter/base.cpp
[SRC] Compiling blitter/null.cpp
[SRC] Compiling bmp.cpp
[SRC] Compiling bootstrap_gui.cpp
[SRC] Compiling bridge_gui.cpp
[SRC] Compiling bridge_map.cpp
[SRC] Compiling build_vehicle_gui.cpp
[SRC] Compiling cargoaction.cpp
[SRC] Compiling cargomonitor.cpp
[SRC] Compiling cargopacket.cpp
[SRC] Compiling cargotype.cpp
[SRC] Compiling cheat.cpp
[SRC] Compiling cheat_gui.cpp
[SRC] Compiling clear_cmd.cpp
[SRC] Compiling command.cpp
[SRC] Compiling company_cmd.cpp
[SRC] Compiling company_gui.cpp
[SRC] Compiling console.cpp
[SRC] Compiling console_cmds.cpp
[SRC] Compiling console_gui.cpp
[SRC] Compiling core/alloc_func.cpp
[SRC] Compiling core/bitmath_func.cpp
[SRC] Compiling core/geometry_func.cpp
[SRC] Compiling core/math_func.cpp
[SRC] Compiling core/pool_func.cpp
[SRC] Compiling core/random_func.cpp
[SRC] Compiling cpu.cpp
[SRC] Compiling crashlog.cpp
[SRC] Compiling currency.cpp
[SRC] Compiling date.cpp
[SRC] Compiling date_gui.cpp
[SRC] Compiling debug.cpp
[SRC] Compiling dedicated.cpp
[SRC] Compiling departures.cpp
[SRC] Compiling departures_gui.cpp
[SRC] Compiling depot.cpp
[SRC] Compiling depot_cmd.cpp
[SRC] Compiling depot_gui.cpp
[SRC] Compiling disaster_vehicle.cpp
[SRC] Compiling dock_gui.cpp
[SRC] Compiling driver.cpp
[SRC] Compiling economy.cpp
[SRC] Compiling effectvehicle.cpp
[SRC] Compiling elrail.cpp
[SRC] Compiling engine.cpp
[SRC] Compiling engine_gui.cpp
[SRC] Compiling error_gui.cpp
[SRC] Compiling fileio.cpp
[SRC] Compiling fios.cpp
[SRC] Compiling fios_gui.cpp
[SRC] Compiling fontcache.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/fontcache.cpp:30:18: warning: 
      unused variable 'MAX_FONT_SIZE' [-Wunused-const-variable]
static const int MAX_FONT_SIZE     = 72; ///< Maximum font size.
                 ^
1 warning generated.
[SRC] Compiling fontdetection.cpp
[SRC] Compiling game/game_config.cpp
[SRC] Compiling game/game_core.cpp
[SRC] Compiling game/game_info.cpp
[SRC] Compiling game/game_instance.cpp
[SRC] Compiling game/game_scanner.cpp
[SRC] Compiling game/game_text.cpp
[SRC] Compiling gamelog.cpp
[SRC] Compiling genworld.cpp
[SRC] Compiling genworld_gui.cpp
[SRC] Compiling gfx.cpp
[SRC] Compiling gfx_layout.cpp
[SRC] Compiling gfxinit.cpp
[SRC] Compiling goal.cpp
[SRC] Compiling goal_gui.cpp
[SRC] Compiling graph_gui.cpp
[SRC] Compiling ground_vehicle.cpp
[SRC] Compiling group_cmd.cpp
[SRC] Compiling group_gui.cpp
[SRC] Compiling heightmap.cpp
[SRC] Compiling highscore.cpp
[SRC] Compiling highscore_gui.cpp
[SRC] Compiling hotkeys.cpp
[SRC] Compiling industry_cmd.cpp
[SRC] Compiling industry_gui.cpp
[SRC] Compiling infrastructure.cpp
[SRC] Compiling ini.cpp
[SRC] Compiling ini_load.cpp
[SRC] Compiling intro_gui.cpp
[SRC] Compiling landscape.cpp
[SRC] Compiling linkgraph/demands.cpp
[SRC] Compiling linkgraph/flowmapper.cpp
[SRC] Compiling linkgraph/linkgraph.cpp
[SRC] Compiling linkgraph/linkgraph_gui.cpp
[SRC] Compiling linkgraph/linkgraphjob.cpp
[SRC] Compiling linkgraph/linkgraphschedule.cpp
[SRC] Compiling linkgraph/mcf.cpp
[SRC] Compiling linkgraph/refresh.cpp
[SRC] Compiling main_gui.cpp
[SRC] Compiling map.cpp
[SRC] Compiling misc.cpp
[SRC] Compiling misc/countedobj.cpp
[SRC] Compiling misc/dbg_helpers.cpp
[SRC] Compiling misc/getoptdata.cpp
[SRC] Compiling misc_cmd.cpp
[SRC] Compiling misc_gui.cpp
[SRC] Compiling mixer.cpp
[SRC] Compiling music.cpp
[SRC] Compiling music/cocoa_m.cpp
[SRC] Compiling music/extmidi.cpp
[SRC] Compiling music/null_m.cpp
[SRC] Compiling music/qtmidi.cpp
[SRC] Compiling music_gui.cpp
[SRC] Compiling network/core/address.cpp
[SRC] Compiling network/core/core.cpp
[SRC] Compiling network/core/host.cpp
[SRC] Compiling network/core/packet.cpp
[SRC] Compiling network/core/tcp.cpp
[SRC] Compiling network/core/tcp_admin.cpp
[SRC] Compiling network/core/tcp_connect.cpp
[SRC] Compiling network/core/tcp_content.cpp
[SRC] Compiling network/core/tcp_game.cpp
[SRC] Compiling network/core/tcp_http.cpp
[SRC] Compiling network/core/udp.cpp
[SRC] Compiling network/network.cpp
[SRC] Compiling network/network_admin.cpp
[SRC] Compiling network/network_chat_gui.cpp
[SRC] Compiling network/network_client.cpp
[SRC] Compiling network/network_command.cpp
[SRC] Compiling network/network_content.cpp
[SRC] Compiling network/network_content_gui.cpp
[SRC] Compiling network/network_gamelist.cpp
[SRC] Compiling network/network_gui.cpp
[SRC] Compiling network/network_server.cpp
[SRC] Compiling network/network_udp.cpp
[SRC] Compiling newgrf.cpp
[SRC] Compiling newgrf_airport.cpp
[SRC] Compiling newgrf_airporttiles.cpp
[SRC] Compiling newgrf_canal.cpp
[SRC] Compiling newgrf_cargo.cpp
[SRC] Compiling newgrf_commons.cpp
[SRC] Compiling newgrf_config.cpp
[SRC] Compiling newgrf_debug_gui.cpp
[SRC] Compiling newgrf_engine.cpp
[SRC] Compiling newgrf_generic.cpp
[SRC] Compiling newgrf_gui.cpp
[SRC] Compiling newgrf_house.cpp
[SRC] Compiling newgrf_industries.cpp
[SRC] Compiling newgrf_industrytiles.cpp
[SRC] Compiling newgrf_object.cpp
[SRC] Compiling newgrf_railtype.cpp
[SRC] Compiling newgrf_sound.cpp
[SRC] Compiling newgrf_spritegroup.cpp
[SRC] Compiling newgrf_station.cpp
[SRC] Compiling newgrf_storage.cpp
[SRC] Compiling newgrf_text.cpp
[SRC] Compiling newgrf_town.cpp
[SRC] Compiling newgrf_townname.cpp
[SRC] Compiling news_gui.cpp
[SRC] Compiling object_cmd.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/object_cmd.cpp:165:23: warning: 
      expression result unused [-Wunused-value]
        (val++, score < 720) ||
        ~~~~~~~~~~~~~~~~~~~~ ^
1 warning generated.
[SRC] Compiling object_gui.cpp
[SRC] Compiling openttd.cpp
[SRC] Compiling order_backup.cpp
[SRC] Compiling order_cmd.cpp
[SRC] Compiling order_gui.cpp
[SRC] Compiling os/macosx/crashlog_osx.cpp
[SRC] Compiling os/macosx/splash.cpp
[SRC] Compiling os/unix/unix.cpp
[SRC] Compiling osk_gui.cpp
[SRC] Compiling pathfinder/npf/aystar.cpp
[SRC] Compiling pathfinder/npf/npf.cpp
[SRC] Compiling pathfinder/npf/queue.cpp
[SRC] Compiling pathfinder/opf/opf_ship.cpp
[SRC] Compiling pathfinder/yapf/yapf_rail.cpp
[SRC] Compiling pathfinder/yapf/yapf_road.cpp
[SRC] Compiling pathfinder/yapf/yapf_ship.cpp
[SRC] Compiling pbs.cpp
[SRC] Compiling plans.cpp
[SRC] Compiling plans_cmd.cpp
[SRC] Compiling plans_gui.cpp
[SRC] Compiling programmable_signals.cpp
[SRC] Compiling programmable_signals_gui.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/programmable_signals_gui.cpp:358:11: warning: 
      6 enumeration values not handled in switch: 'PSO_FIRST', 'PSO_LAST',
      'PSO_IF_ELSE'... [-Wswitch]
                        switch(si->Opcode()) {
                               ^
1 warning generated.
[SRC] Compiling progress.cpp
[SRC] Compiling rail.cpp
[SRC] Compiling rail_cmd.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/rail_cmd.cpp:1021:15: warning: 
      unused variable 'ret' [-Wunused-variable]
                CommandCost ret = EnsureNoTrainOnTrack(GetOtherTunnelBri...
                            ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/rail_cmd.cpp:2358:73: warning: 
      expression result unused [-Wunused-value]
  ...(image++,                          (track & TRACK_BIT_3WAY_SE) == 0) ||
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
2 warnings generated.
[SRC] Compiling rail_gui.cpp
[SRC] Compiling rev.cpp
[SRC] Compiling road.cpp
[SRC] Compiling road_cmd.cpp
[SRC] Compiling road_gui.cpp
[SRC] Compiling road_map.cpp
[SRC] Compiling roadstop.cpp
[SRC] Compiling roadveh_cmd.cpp
[SRC] Compiling roadveh_gui.cpp
[SRC] Compiling saveload/afterload.cpp
[SRC] Compiling saveload/ai_sl.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/ai_sl.cpp:31:6: error: 
      non-aggregate type 'SlXvFeatureTest' cannot be initialized with an
      initializer list
            SLEG_STR(_ai_saveload_name,        SLE_STRB),
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:464:34: note: 
      expanded from macro 'SLEG_STR'
  ...SLEG_CONDSTR(variable, type, lengthof(variable), 0, SL_MAX_VERSION)
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:425:105: note: 
      expanded from macro 'SLEG_CONDSTR'
  ...length, from, to) SLEG_CONDSTR_X(variable, type, length, from, to, {})
                                                                        ^~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:424:123: note: 
      expanded from macro 'SLEG_CONDSTR_X'
  ...extver) SLEG_GENERAL_X(SL_STR, variable, type, length, from, to, extver)
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:378:143: note: 
      expanded from macro 'SLEG_GENERAL_X'
  ...cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/ai_sl.cpp:32:6: error: 
      non-aggregate type 'SlXvFeatureTest' cannot be initialized with an
      initializer list
            SLEG_STR(_ai_saveload_settings,    SLE_STRB),
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:464:34: note: 
      expanded from macro 'SLEG_STR'
  ...SLEG_CONDSTR(variable, type, lengthof(variable), 0, SL_MAX_VERSION)
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:425:105: note: 
      expanded from macro 'SLEG_CONDSTR'
  ...length, from, to) SLEG_CONDSTR_X(variable, type, length, from, to, {})
                                                                        ^~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:424:123: note: 
      expanded from macro 'SLEG_CONDSTR_X'
  ...extver) SLEG_GENERAL_X(SL_STR, variable, type, length, from, to, extver)
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:378:143: note: 
      expanded from macro 'SLEG_GENERAL_X'
  ...cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/ai_sl.cpp:33:2: error: 
      non-aggregate type 'SlXvFeatureTest' cannot be initialized with an
      initializer list
        SLEG_CONDVAR(_ai_saveload_version,   SLE_UINT32, 108, SL_MAX_VERSION),
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:390:89: note: 
      expanded from macro 'SLEG_CONDVAR'
  ...type, from, to) SLEG_CONDVAR_X(variable, type, from, to, {})
                                                              ^~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:389:110: note: 
      expanded from macro 'SLEG_CONDVAR_X'
  ...to, extver) SLEG_GENERAL_X(SL_VAR, variable, type, 0, from, to, extver)
                                                                     ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:378:143: note: 
      expanded from macro 'SLEG_GENERAL_X'
  ...cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/ai_sl.cpp:34:2: error: 
      non-aggregate type 'SlXvFeatureTest' cannot be initialized with an
      initializer list
        SLEG_CONDVAR(_ai_saveload_is_random,   SLE_BOOL, 136, SL_MAX_VERSION),
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:390:89: note: 
      expanded from macro 'SLEG_CONDVAR'
  ...type, from, to) SLEG_CONDVAR_X(variable, type, from, to, {})
                                                              ^~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:389:110: note: 
      expanded from macro 'SLEG_CONDVAR_X'
  ...to, extver) SLEG_GENERAL_X(SL_VAR, variable, type, 0, from, to, extver)
                                                                     ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:378:143: note: 
      expanded from macro 'SLEG_GENERAL_X'
  ...cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/ai_sl.cpp:35:7: error: 
      non-aggregate type 'SlXvFeatureTest' cannot be initialized with an
      initializer list
             SLE_END()
             ^~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:366:56: note: 
      expanded from macro 'SLE_END'
#define SLE_END() {false, SL_END, 0, 0, 0, 0, NULL, 0, {}}
                                                       ^~
5 errors generated.
make[1]: *** [saveload/ai_sl.o] Error 1
make: *** [all] Error 1
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ 
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

Valle wrote:That list of patches sounds very promising to me, thank you for your efforts! Of course, I wanted to try it right away.

I tried to compile the source on Mac OS X Yosemite (10.10.4) without LZMA (I have the successor XZ, but it seems like that's not identified during the configuration.
Could somebody please have a look at the warnings and errors in the following log?

EDIT: Sorry, I just found a major error on my side. I lacked pkgconfig. Replacing the log found below with that of my current compilation if it also ends with an error.

EDIT 2: Log replaced, 5 errors are generated with pkgconfig as well.
Thanks for the bug report, can you try building with the attached diff instead, and let me know how it goes?
Attachments
jgrpp-0.1.1-test1.diff
(1.1 MiB) Downloaded 1874 times
Ex TTDPatch Coder
Patch Pack, Github
User avatar
Valle
Transport Coordinator
Transport Coordinator
Posts: 284
Joined: 15 May 2007 11:35
Location: Germany

Re: JGR's Patch Pack

Post by Valle »

Thank your for your quick reply. Multiple warnings aside, there is still one error.

Code: Select all

Last login: Sun Aug 16 15:31:56 on ttys002
Valentins-MacBook-Pro:~ Val$ cd /Users/Val/Downloads/OpenTTD-patches-jgrpp 
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ patch -p 0 -R d /Users/Val/Downloads/OpenTTD-patches-jgrpp < /Users/Val/Downloads/jgrpp-0.1.1-test1.diff 
patch: **** read error : Is a directory
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ patch -p 0 -R -d /Users/Val/Downloads/OpenTTD-patches-jgrpp < /Users/Val/Downloads/jgrpp-0.1.1-test1.diff 
patching file findversion.sh
Unreversed patch detected!  Ignore -R? [n] n
Apply anyway? [n] y
Hunk #1 FAILED at 99.
1 out of 1 hunk FAILED -- saving rejects to file findversion.sh.rej
patching file projects/openttd_vs100.vcxproj
patching file projects/openttd_vs100.vcxproj.filters
patching file projects/openttd_vs80.vcproj
patching file projects/openttd_vs90.vcproj
patching file source.list
patching file src/aircraft.h
patching file src/aircraft_cmd.cpp
patching file src/airport_gui.cpp
patching file src/animated_tile.cpp
patching file src/base_consist.h
patching file src/blitter/32bpp_anim.cpp
patching file src/blitter/32bpp_anim.hpp
patching file src/blitter/32bpp_base.cpp
patching file src/blitter/32bpp_base.hpp
patching file src/blitter/32bpp_optimized.cpp
patching file src/blitter/8bpp_base.cpp
patching file src/blitter/8bpp_base.hpp
patching file src/blitter/8bpp_optimized.cpp
patching file src/blitter/base.hpp
patching file src/blitter/null.hpp
patching file src/clear_cmd.cpp
patching file src/clear_func.h
patching file src/command.cpp
patching file src/command_func.h
patching file src/command_type.h
patching file src/company_cmd.cpp
patching file src/company_gui.cpp
patching file src/console_gui.cpp
patching file src/date.cpp
patching file src/date_func.h
patching file src/date_gui.cpp
patching file src/date_gui.h
patching file src/date_type.h
patching file src/departures.cpp
patching file src/departures_func.h
patching file src/departures_gui.cpp
patching file src/departures_gui.h
patching file src/departures_type.h
patching file src/depot.cpp
patching file src/depot_gui.cpp
patching file src/disaster_vehicle.cpp
patching file src/dock_gui.cpp
patching file src/economy.cpp
patching file src/economy_type.h
patching file src/fios.h
patching file src/gfx.cpp
patching file src/gfxinit.cpp
patching file src/ground_vehicle.cpp
patching file src/ground_vehicle.hpp
patching file src/group_gui.cpp
patching file src/hotkeys.cpp
patching file src/house.h
patching file src/industry_cmd.cpp
patching file src/industry_gui.cpp
patching file src/infrastructure.cpp
patching file src/infrastructure_func.h
patching file src/lang/danish.txt
patching file src/lang/english.txt
patching file src/lang/russian.txt
patching file src/main_gui.cpp
patching file src/misc.cpp
patching file src/misc_gui.cpp
patching file src/network/core/packet.cpp
patching file src/network/core/packet.h
patching file src/network/network_client.cpp
patching file src/network/network_command.cpp
patching file src/network/network_gui.cpp
patching file src/network/network_server.cpp
patching file src/newgrf.cpp
patching file src/newgrf.h
patching file src/newgrf_animation_base.h
patching file src/newgrf_house.cpp
patching file src/newgrf_house.h
patching file src/newgrf_industrytiles.cpp
patching file src/newgrf_station.cpp
patching file src/newgrf_town.cpp
patching file src/newgrf_town.h
patching file src/object_cmd.cpp
patching file src/openttd.cpp
patching file src/order_backup.cpp
patching file src/order_base.h
patching file src/order_cmd.cpp
patching file src/order_gui.cpp
patching file src/order_type.h
patching file src/osk_gui.cpp
patching file src/pathfinder/follow_track.hpp
patching file src/pathfinder/npf/npf.cpp
patching file src/pathfinder/yapf/yapf_costrail.hpp
patching file src/pathfinder/yapf/yapf_rail.cpp
patching file src/pbs.cpp
patching file src/plans.cpp
patching file src/plans_base.h
patching file src/plans_cmd.cpp
patching file src/plans_func.h
patching file src/plans_gui.cpp
patching file src/plans_type.h
patching file src/programmable_signals.cpp
patching file src/programmable_signals.h
patching file src/programmable_signals_gui.cpp
patching file src/rail_cmd.cpp
patching file src/rail_gui.cpp
patching file src/rail_map.h
patching file src/road_cmd.cpp
patching file src/road_gui.cpp
patching file src/roadveh.h
patching file src/roadveh_cmd.cpp
patching file src/saveload/afterload.cpp
patching file src/saveload/company_sl.cpp
patching file src/saveload/extended_ver_sl.cpp
patching file src/saveload/extended_ver_sl.h
patching file src/saveload/misc_sl.cpp
patching file src/saveload/order_sl.cpp
patching file src/saveload/plans_sl.cpp
patching file src/saveload/saveload.cpp
patching file src/saveload/saveload.h
Hunk #3 FAILED at 226.
Hunk #4 FAILED at 237.
Hunk #5 FAILED at 247.
Hunk #6 FAILED at 258.
Hunk #7 FAILED at 269.
Hunk #8 FAILED at 279.
Hunk #9 FAILED at 335.
Hunk #10 FAILED at 354.
Hunk #11 FAILED at 364.
Hunk #12 FAILED at 373.
Hunk #13 FAILED at 383.
Hunk #14 FAILED at 393.
Hunk #15 FAILED at 402.
Hunk #16 FAILED at 445.
14 out of 18 hunks FAILED -- saving rejects to file src/saveload/saveload.h.rej
patching file src/saveload/saveload_internal.h
patching file src/saveload/signal_sl.cpp
patching file src/saveload/tracerestrict_sl.cpp
patching file src/saveload/vehicle_sl.cpp
patching file src/screenshot.cpp
patching file src/screenshot.h
patching file src/script/api/game/game_window.hpp.sq
patching file src/script/api/script_object.cpp
patching file src/script/api/script_window.hpp
patching file src/script/api/template/template_window.hpp.sq
patching file src/settings.cpp
patching file src/settings_gui.cpp
patching file src/settings_internal.h
patching file src/settings_type.h
patching file src/ship_cmd.cpp
patching file src/signal.cpp
patching file src/signal_func.h
patching file src/signal_type.h
patching file src/smallmap_colours.h
patching file src/smallmap_gui.cpp
patching file src/smallmap_gui.h
patching file src/sound.cpp
patching file src/spritecache.cpp
patching file src/spritecache.h
patching file src/station.cpp
patching file src/station_cmd.cpp
patching file src/station_gui.cpp
patching file src/statusbar_gui.cpp
patching file src/stdafx.h
patching file src/string.cpp
patching file src/string_func.h
patching file src/strings.cpp
patching file src/table/company_settings.ini
Hunk #2 FAILED at 34.
1 out of 2 hunks FAILED -- saving rejects to file src/table/company_settings.ini.rej
patching file src/table/control_codes.h
patching file src/table/currency_settings.ini
Hunk #2 FAILED at 28.
1 out of 2 hunks FAILED -- saving rejects to file src/table/currency_settings.ini.rej
patching file src/table/darklight_colours.h
patching file src/table/gameopt_settings.ini
Hunk #2 FAILED at 62.
1 out of 2 hunks FAILED -- saving rejects to file src/table/gameopt_settings.ini.rej
patching file src/table/misc_settings.ini
Hunk #2 FAILED at 35.
1 out of 4 hunks FAILED -- saving rejects to file src/table/misc_settings.ini.rej
patching file src/table/settings.h.preamble
patching file src/table/settings.ini
Hunk #3 FAILED at 91.
1 out of 16 hunks FAILED -- saving rejects to file src/table/settings.ini.rej
patching file src/table/sprites.h
patching file src/table/strgen_tables.h
patching file src/table/tree_land.h
patching file src/table/win32_settings.ini
Hunk #2 FAILED at 33.
1 out of 2 hunks FAILED -- saving rejects to file src/table/win32_settings.ini.rej
patching file src/table/window_settings.ini
Hunk #2 FAILED at 29.
1 out of 2 hunks FAILED -- saving rejects to file src/table/window_settings.ini.rej
patching file src/terraform_gui.cpp
patching file src/tilearea_type.h
patching file src/timetable.h
patching file src/timetable_cmd.cpp
patching file src/timetable_gui.cpp
patching file src/toolbar_gui.cpp
patching file src/town.h
patching file src/town_cmd.cpp
patching file src/town_gui.cpp
patching file src/town_gui.h
patching file src/town_type.h
patching file src/tracerestrict.cpp
patching file src/tracerestrict.h
patching file src/tracerestrict_gui.cpp
patching file src/train.h
patching file src/train_cmd.cpp
patching file src/train_gui.cpp
patching file src/transparency.h
patching file src/transparency_gui.cpp
patching file src/tree_cmd.cpp
patching file src/tree_gui.cpp
patching file src/tunnelbridge.h
patching file src/tunnelbridge_cmd.cpp
patching file src/tunnelbridge_map.h
patching file src/vehicle.cpp
patching file src/vehicle_base.h
patching file src/vehicle_cmd.cpp
patching file src/vehicle_func.h
patching file src/vehicle_gui.cpp
patching file src/vehicle_gui.h
patching file src/vehicle_type.h
patching file src/viewport.cpp
patching file src/viewport_func.h
patching file src/viewport_gui.cpp
patching file src/viewport_type.h
patching file src/water_cmd.cpp
patching file src/waypoint.cpp
patching file src/waypoint_cmd.cpp
patching file src/waypoint_gui.cpp
patching file src/widgets/departures_widget.h
patching file src/widgets/dropdown.cpp
patching file src/widgets/dropdown_func.h
patching file src/widgets/dropdown_type.h
patching file src/widgets/group_widget.h
patching file src/widgets/order_widget.h
patching file src/widgets/plans_widget.h
patching file src/widgets/rail_widget.h
patching file src/widgets/smallmap_widget.h
patching file src/widgets/station_widget.h
patching file src/widgets/terraform_widget.h
patching file src/widgets/timetable_widget.h
patching file src/widgets/town_widget.h
patching file src/widgets/transparency_widget.h
patching file src/widgets/waypoint_widget.h
patching file src/window.cpp
patching file src/window_func.h
patching file src/window_gui.h
patching file src/window_type.h
patching file src/zoning.h
patching file src/zoning_cmd.cpp
patching file src/zoning_gui.cpp
patching file src/zoom_type.h
The next patch, when reversed, would delete the file .ottdrev,
which does not exist!  Ignore -R? [n] n     
Apply anyway? [n] y
can't find file to patch at input line 29587
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: .ottdrev
|new file mode 100644
|===================================================================
|--- .ottdrev	(revision 0)
|+++ .ottdrev	(working copy)
--------------------------
File to patch: 
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ ./configure
checking awk... awk
detecting OS... OSX
checking build system type... x86_64-apple-darwin14.4.0
checking host system type... x86_64-apple-darwin14.4.0
checking universal build... no
checking build cc... gcc
checking host cc... gcc
checking build c++... g++
checking host c++... g++
checking strip... disabled
checking builtin depend... yes
checking makedepend... disabled
detecting cpu-type... 64 bits
detecting SSE... found
checking static... no
checking unicode... no
using debug level... no
using desync debug level... no
using link time optimization... no
checking OSX sysroot... no (use system default)
checking Allegro... OSX, skipping
checking SDL... OSX, skipping
checking COCOA... found
checking whether to enable the Quartz window subdriver... yes
checking Quickdraw window subdriver... disabled (64 bits)
checking GDI video driver... not Windows, skipping
checking dedicated... not selected
checking console application... not Windows, skipping
checking network... found
checking squirrel... found
checking translator... no
checking assert... enabled
checking zlib... found
checking liblzma... found
checking lzo2... found
checking libxdg-basedir... not found
checking libpng... found
checking freetype2... not found
checking libfontconfig... OSX, skipping
checking icu-lx... not found
checking icu-i18n... not found
checking psp-config... not PSP, skipping
checking libtimidity... not found
checking direct-music... not Windows, skipping
checking sort... sort
checking endianness... PREPROCESSOR
suppress language errors... no
checking stripping... skipped
checking distcc... no (only used when forced)
checking ccache... no (only used when forced)
checking grfcodec... not found
checking nforenum... not found
detecting ppc970 (G5)... no
checking revision... no detection
WARNING: there is no means to determine the version.
WARNING: please use a subversion, mercurial, or git checkout of OpenTTD.
WARNING: you can only join game servers that have been compiled without
WARNING:   version detection.
WARNING: there is a great chance you desync.
WARNING: USE WITH CAUTION!
checking iconv... found
checking if iconv has non-const inbuf... yes
checking whether to link to iconv... yes
personal home directory... Documents/OpenTTD
shared data directory... /Library/Application\ Support/OpenTTD
installation directory... /
icon theme directory... none
manual page directory... share/man/man6
menu item directory... none
clang: error: unsupported option '-dumpspecs'
clang: error: no input files
clang: error: unsupported option '-dumpspecs'
clang: error: no input files
using CFLAGS_BUILD...  -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -DOSX
using CXXFLAGS_BUILD... 
using LDFLAGS_BUILD... 
using CFLAGS...  -O2 -fomit-frame-pointer  -Wall -Wno-multichar -Wsign-compare -Wundef -Wwrite-strings -Wpointer-arith -W -Wno-unused-parameter -Wredundant-decls -Wformat=2 -Wformat-security -Winit-self -fno-strict-aliasing -Wcast-qual -fno-strict-overflow -Wnon-virtual-dtor -DOSX -DWITH_SSE -isystem/opt/local/include -DNO_QUICKTIME -mmacosx-version-min=10.5 -DUNIX -DWITH_COCOA -DENABLE_COCOA_QUARTZ -DWITH_ZLIB   -DWITH_LZMA -I/usr/local/Cellar/xz/5.2.1/include   -DWITH_LZO -D_SQ64 -I/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/3rdparty/squirrel/include -DWITH_PNG -I/usr/local/Cellar/libpng/1.6.17/include/libpng16   -DWITH_ICONV -DENABLE_NETWORK -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\"Documents/OpenTTD\" -DWITH_SHARED_DIR -DSHARED_DIR=\"/Library/Application\ Support/OpenTTD\" -DGLOBAL_DATA_DIR=\"/usr/local/share/games/openttd\"
using CXXFLAGS... 
using LDFLAGS... -lstdc++ -lc -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -L/usr/lib -lz   -L/usr/local/Cellar/xz/5.2.1/lib -llzma   -llzo2 -L/usr/local/Cellar/libpng/1.6.17/lib -lpng16   -liconv   -framework Cocoa
Generating Makefile...
Generating lang/Makefile...
Generating setting/Makefile...
Generating grf/Makefile...
Generating objs/Makefile...
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ make
[LANG] Compiling string.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/string.cpp:54:49: warning: 
      format string is not a string literal [-Wformat-nonliteral]
        return min((int)diff, vsnprintf(str, diff + 1, format, ap));
                                                       ^~~~~~
1 warning generated.
[LANG] Compiling strgen/strgen_base.cpp
[LANG] Compiling strgen/strgen.cpp
[LANG] Compiling and Linking strgen
[LANG] Generating table/strings.h
[LANG] Compiling language afrikaans
[LANG] Compiling language arabic_egypt
[LANG] Compiling language basque
[LANG] Compiling language belarusian
[LANG] Compiling language brazilian_portuguese
[LANG] Compiling language bulgarian
[LANG] Compiling language catalan
[LANG] Compiling language croatian
[LANG] Compiling language czech
[LANG] Compiling language danish
[LANG] Compiling language dutch
[LANG] Compiling language english
[LANG] Compiling language english_AU
[LANG] Compiling language english_US
[LANG] Compiling language esperanto
[LANG] Compiling language estonian
[LANG] Compiling language faroese
[LANG] Compiling language finnish
[LANG] Compiling language french
[LANG] Compiling language gaelic
[LANG] Compiling language galician
[LANG] Compiling language german
[LANG] Compiling language greek
[LANG] Compiling language hebrew
[LANG] Compiling language hungarian
[LANG] Compiling language icelandic
[LANG] Compiling language indonesian
[LANG] Compiling language irish
[LANG] Compiling language italian
[LANG] Compiling language japanese
[LANG] Compiling language korean
[LANG] Compiling language latin
[LANG] Compiling language latvian
[LANG] Compiling language lithuanian
[LANG] Compiling language luxembourgish
[LANG] Compiling language malay
[LANG] Compiling language norwegian_bokmal
[LANG] Compiling language norwegian_nynorsk
[LANG] Compiling language polish
[LANG] Compiling language portuguese
[LANG] Compiling language romanian
[LANG] Compiling language russian
[LANG] Compiling language serbian
[LANG] Compiling language simplified_chinese
[LANG] Compiling language slovak
[LANG] Compiling language slovenian
[LANG] Compiling language spanish
[LANG] Compiling language swedish
[LANG] Compiling language tamil
[LANG] Compiling language thai
[LANG] Compiling language traditional_chinese
[LANG] Compiling language turkish
[LANG] Compiling language ukrainian
[LANG] Compiling language vietnamese
[LANG] Compiling language welsh
[SETTING] Compiling string.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/string.cpp:54:49: warning: 
      format string is not a string literal [-Wformat-nonliteral]
        return min((int)diff, vsnprintf(str, diff + 1, format, ap));
                                                       ^~~~~~
1 warning generated.
[SETTING] Compiling ini_load.cpp
[SETTING] Compiling settingsgen/settingsgen.cpp
[SETTING] Compiling and Linking settings_gen
[SETTING] Generating table/settings.h
make[1]: Nothing to be done for `all'.
[SRC] DEP CHECK (all files)
[SRC] Compiling 3rdparty/md5/md5.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdaux.cpp
[SRC] Compiling 3rdparty/squirrel/sqstdlib/sqstdmath.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqapi.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqbaselib.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqclass.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqcompiler.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqdebug.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqfuncstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqlexer.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqmem.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqobject.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqstate.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqtable.cpp
[SRC] Compiling 3rdparty/squirrel/squirrel/sqvm.cpp
[SRC] Compiling ai/ai_config.cpp
[SRC] Compiling ai/ai_core.cpp
[SRC] Compiling ai/ai_gui.cpp
[SRC] Compiling ai/ai_info.cpp
[SRC] Compiling ai/ai_instance.cpp
[SRC] Compiling ai/ai_scanner.cpp
[SRC] Compiling aircraft_cmd.cpp
[SRC] Compiling aircraft_gui.cpp
[SRC] Compiling airport.cpp
[SRC] Compiling airport_gui.cpp
[SRC] Compiling animated_tile.cpp
[SRC] Compiling articulated_vehicles.cpp
[SRC] Compiling autoreplace.cpp
[SRC] Compiling autoreplace_cmd.cpp
[SRC] Compiling autoreplace_gui.cpp
[SRC] Compiling base_consist.cpp
[SRC] Compiling blitter/32bpp_anim.cpp
[SRC] Compiling blitter/32bpp_anim_sse4.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_anim_sse4.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_anim_sse4.hpp:26:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse4.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/32bpp_base.cpp
[SRC] Compiling blitter/32bpp_optimized.cpp
[SRC] Compiling blitter/32bpp_simple.cpp
[SRC] Compiling blitter/32bpp_sse2.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/32bpp_sse4.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse4.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse4.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/32bpp_ssse3.cpp
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.cpp:17:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_ssse3.hpp:25:
In file included from /Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse2.hpp:25:
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/blitter/32bpp_sse_type.h:33:10: warning: 
      'ALIGN' macro redefined [-Wmacro-redefined]
        #define ALIGN(n) __attribute__ ((aligned (n)))
                ^
/usr/include/i386/param.h:83:9: note: previous definition is here
#define ALIGN(p)        __DARWIN_ALIGN(p)
        ^
1 warning generated.
[SRC] Compiling blitter/8bpp_base.cpp
[SRC] Compiling blitter/8bpp_optimized.cpp
[SRC] Compiling blitter/8bpp_simple.cpp
[SRC] Compiling blitter/base.cpp
[SRC] Compiling blitter/null.cpp
[SRC] Compiling bmp.cpp
[SRC] Compiling bootstrap_gui.cpp
[SRC] Compiling bridge_gui.cpp
[SRC] Compiling bridge_map.cpp
[SRC] Compiling build_vehicle_gui.cpp
[SRC] Compiling cargoaction.cpp
[SRC] Compiling cargomonitor.cpp
[SRC] Compiling cargopacket.cpp
[SRC] Compiling cargotype.cpp
[SRC] Compiling cheat.cpp
[SRC] Compiling cheat_gui.cpp
[SRC] Compiling clear_cmd.cpp
[SRC] Compiling command.cpp
[SRC] Compiling company_cmd.cpp
[SRC] Compiling company_gui.cpp
[SRC] Compiling console.cpp
[SRC] Compiling console_cmds.cpp
[SRC] Compiling console_gui.cpp
[SRC] Compiling core/alloc_func.cpp
[SRC] Compiling core/bitmath_func.cpp
[SRC] Compiling core/geometry_func.cpp
[SRC] Compiling core/math_func.cpp
[SRC] Compiling core/pool_func.cpp
[SRC] Compiling core/random_func.cpp
[SRC] Compiling cpu.cpp
[SRC] Compiling crashlog.cpp
[SRC] Compiling currency.cpp
[SRC] Compiling date.cpp
[SRC] Compiling date_gui.cpp
[SRC] Compiling debug.cpp
[SRC] Compiling dedicated.cpp
[SRC] Compiling depot.cpp
[SRC] Compiling depot_cmd.cpp
[SRC] Compiling depot_gui.cpp
[SRC] Compiling disaster_vehicle.cpp
[SRC] Compiling dock_gui.cpp
[SRC] Compiling driver.cpp
[SRC] Compiling economy.cpp
[SRC] Compiling effectvehicle.cpp
[SRC] Compiling elrail.cpp
[SRC] Compiling engine.cpp
[SRC] Compiling engine_gui.cpp
[SRC] Compiling error_gui.cpp
[SRC] Compiling fileio.cpp
[SRC] Compiling fios.cpp
[SRC] Compiling fios_gui.cpp
[SRC] Compiling fontcache.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/fontcache.cpp:30:18: warning: 
      unused variable 'MAX_FONT_SIZE' [-Wunused-const-variable]
static const int MAX_FONT_SIZE     = 72; ///< Maximum font size.
                 ^
1 warning generated.
[SRC] Compiling game/game_config.cpp
[SRC] Compiling game/game_core.cpp
[SRC] Compiling game/game_info.cpp
[SRC] Compiling game/game_instance.cpp
[SRC] Compiling game/game_scanner.cpp
[SRC] Compiling game/game_text.cpp
[SRC] Compiling gamelog.cpp
[SRC] Compiling genworld.cpp
[SRC] Compiling genworld_gui.cpp
[SRC] Compiling gfx.cpp
[SRC] Compiling gfx_layout.cpp
[SRC] Compiling gfxinit.cpp
[SRC] Compiling goal.cpp
[SRC] Compiling goal_gui.cpp
[SRC] Compiling graph_gui.cpp
[SRC] Compiling ground_vehicle.cpp
[SRC] Compiling group_cmd.cpp
[SRC] Compiling group_gui.cpp
[SRC] Compiling heightmap.cpp
[SRC] Compiling highscore.cpp
[SRC] Compiling highscore_gui.cpp
[SRC] Compiling hotkeys.cpp
[SRC] Compiling industry_cmd.cpp
[SRC] Compiling industry_gui.cpp
[SRC] Compiling ini.cpp
[SRC] Compiling ini_load.cpp
[SRC] Compiling intro_gui.cpp
[SRC] Compiling landscape.cpp
[SRC] Compiling linkgraph/demands.cpp
[SRC] Compiling linkgraph/flowmapper.cpp
[SRC] Compiling linkgraph/linkgraph.cpp
[SRC] Compiling linkgraph/linkgraph_gui.cpp
[SRC] Compiling linkgraph/linkgraphjob.cpp
[SRC] Compiling linkgraph/linkgraphschedule.cpp
[SRC] Compiling linkgraph/mcf.cpp
[SRC] Compiling linkgraph/refresh.cpp
[SRC] Compiling main_gui.cpp
[SRC] Compiling map.cpp
[SRC] Compiling misc.cpp
[SRC] Compiling misc/countedobj.cpp
[SRC] Compiling misc/dbg_helpers.cpp
[SRC] Compiling misc/getoptdata.cpp
[SRC] Compiling misc_cmd.cpp
[SRC] Compiling misc_gui.cpp
[SRC] Compiling mixer.cpp
[SRC] Compiling music.cpp
[SRC] Compiling music/cocoa_m.cpp
[SRC] Compiling music/extmidi.cpp
[SRC] Compiling music/null_m.cpp
[SRC] Compiling music_gui.cpp
[SRC] Compiling network/core/address.cpp
[SRC] Compiling network/core/core.cpp
[SRC] Compiling network/core/host.cpp
[SRC] Compiling network/core/packet.cpp
[SRC] Compiling network/core/tcp.cpp
[SRC] Compiling network/core/tcp_admin.cpp
[SRC] Compiling network/core/tcp_connect.cpp
[SRC] Compiling network/core/tcp_content.cpp
[SRC] Compiling network/core/tcp_game.cpp
[SRC] Compiling network/core/tcp_http.cpp
[SRC] Compiling network/core/udp.cpp
[SRC] Compiling network/network.cpp
[SRC] Compiling network/network_admin.cpp
[SRC] Compiling network/network_chat_gui.cpp
[SRC] Compiling network/network_client.cpp
[SRC] Compiling network/network_command.cpp
[SRC] Compiling network/network_content.cpp
[SRC] Compiling network/network_content_gui.cpp
[SRC] Compiling network/network_gamelist.cpp
[SRC] Compiling network/network_gui.cpp
[SRC] Compiling network/network_server.cpp
[SRC] Compiling network/network_udp.cpp
[SRC] Compiling newgrf.cpp
[SRC] Compiling newgrf_airport.cpp
[SRC] Compiling newgrf_airporttiles.cpp
[SRC] Compiling newgrf_canal.cpp
[SRC] Compiling newgrf_cargo.cpp
[SRC] Compiling newgrf_commons.cpp
[SRC] Compiling newgrf_config.cpp
[SRC] Compiling newgrf_debug_gui.cpp
[SRC] Compiling newgrf_engine.cpp
[SRC] Compiling newgrf_generic.cpp
[SRC] Compiling newgrf_gui.cpp
[SRC] Compiling newgrf_house.cpp
[SRC] Compiling newgrf_industries.cpp
[SRC] Compiling newgrf_industrytiles.cpp
[SRC] Compiling newgrf_object.cpp
[SRC] Compiling newgrf_railtype.cpp
[SRC] Compiling newgrf_sound.cpp
[SRC] Compiling newgrf_spritegroup.cpp
[SRC] Compiling newgrf_station.cpp
[SRC] Compiling newgrf_storage.cpp
[SRC] Compiling newgrf_text.cpp
[SRC] Compiling newgrf_town.cpp
[SRC] Compiling newgrf_townname.cpp
[SRC] Compiling news_gui.cpp
[SRC] Compiling object_cmd.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/object_cmd.cpp:165:23: warning: 
      expression result unused [-Wunused-value]
        (val++, score < 720) ||
        ~~~~~~~~~~~~~~~~~~~~ ^
1 warning generated.
[SRC] Compiling object_gui.cpp
[SRC] Compiling openttd.cpp
[SRC] Compiling order_backup.cpp
[SRC] Compiling order_cmd.cpp
[SRC] Compiling order_gui.cpp
[SRC] Compiling os/macosx/crashlog_osx.cpp
[SRC] Compiling os/macosx/splash.cpp
[SRC] Compiling os/unix/unix.cpp
[SRC] Compiling osk_gui.cpp
[SRC] Compiling pathfinder/npf/aystar.cpp
[SRC] Compiling pathfinder/npf/npf.cpp
[SRC] Compiling pathfinder/npf/queue.cpp
[SRC] Compiling pathfinder/opf/opf_ship.cpp
[SRC] Compiling pathfinder/yapf/yapf_rail.cpp
[SRC] Compiling pathfinder/yapf/yapf_road.cpp
[SRC] Compiling pathfinder/yapf/yapf_ship.cpp
[SRC] Compiling pbs.cpp
[SRC] Compiling progress.cpp
[SRC] Compiling rail.cpp
[SRC] Compiling rail_cmd.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/rail_cmd.cpp:2255:73: warning: 
      expression result unused [-Wunused-value]
  ...(image++,                          (track & TRACK_BIT_3WAY_SE) == 0) ||
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
1 warning generated.
[SRC] Compiling rail_gui.cpp
[SRC] Compiling rev.cpp
[SRC] Compiling road.cpp
[SRC] Compiling road_cmd.cpp
[SRC] Compiling road_gui.cpp
[SRC] Compiling road_map.cpp
[SRC] Compiling roadstop.cpp
[SRC] Compiling roadveh_cmd.cpp
[SRC] Compiling roadveh_gui.cpp
[SRC] Compiling saveload/afterload.cpp
[SRC] Compiling saveload/ai_sl.cpp
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/ai_sl.cpp:31:6: error: 
      excess elements in struct initializer
            SLEG_STR(_ai_saveload_name,        SLE_STRB),
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:460:34: note: 
      expanded from macro 'SLEG_STR'
  ...SLEG_CONDSTR(variable, type, lengthof(variable), 0, SL_MAX_VERSION)
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:421:105: note: 
      expanded from macro 'SLEG_CONDSTR'
  ...length, from, to) SLEG_CONDSTR_X(variable, type, length, from, to, {})
                                                                        ^~
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:420:123: note: 
      expanded from macro 'SLEG_CONDSTR_X'
  ...extver) SLEG_GENERAL_X(SL_STR, variable, type, length, from, to, extver)
                                                                      ^
/Users/Val/Downloads/OpenTTD-patches-jgrpp/src/saveload/saveload.h:374:143: note: 
      expanded from macro 'SLEG_GENERAL_X'
  ...cmd, type, length, from, to, (void*)&variable, sizeof(variable), extver}
                                                                      ^
1 error generated.
make[1]: *** [saveload/ai_sl.o] Error 1
make: *** [all] Error 1
Valentins-MacBook-Pro:OpenTTD-patches-jgrpp Val$ 
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

Valle wrote:Thank your for your quick reply. Multiple warnings aside, there is still one error.
It looks like you're trying the apply the new patch on top of the old one, or are trying to reverse the old patch with the new one?
Can you make sure that your working copy is clean before applying the patch.

Alternatively it may be easier for you to clone the repo using:

Code: Select all

git clone -b jgrpp https://github.com/JGRennison/OpenTTD-patches.git jgrpp && cd jgrpp
Ex TTDPatch Coder
Patch Pack, Github
User avatar
wallyweb
Tycoon
Tycoon
Posts: 6102
Joined: 27 Nov 2004 15:05
Location: Canada

Re: JGR's Patch Pack

Post by wallyweb »

Comm Cody wrote:Now if there was only a way to merge this with Cirdan's map pack and HackABit tree line patch, I would have my dream OTTD build.
/me echoes
Once Cirdan is back to his environment and is able to rebase from r27220, this would indeed be an interesting endeavour. :D
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

Comm Cody wrote:Now if there was only a way to merge this with Cirdan's map pack and HackABit tree line patch, I would have my dream OTTD build.
HackABit's tree line patch seems a bit unfinished, IMO.
I'm not so keen to merge it when it adds settings with no GUI, and uses a very odd setting format.
wallyweb wrote:/me echoes
Once Cirdan is back to his environment and is able to rebase from r27220, this would indeed be an interesting endeavour. :D
Cirdan's branch is huge, and makes a *lot* of changes mixed with partial cherry-pickings of trunk. This makes it a bit difficult to work out (in aggregate) what has actually been changed and may need to be merged, and what just hasn't been picked from trunk. These changes aren't just limited to new map features, but there's all sorts of random things which have been heavily modified.
Rebasing on a newer trunk would help (at least in the short term), but then it'd become increasingly difficult to track as it diverged away again. If it was later rebased after I'd merged it it'd also be potentially problematic.
Ex TTDPatch Coder
Patch Pack, Github
User avatar
wallyweb
Tycoon
Tycoon
Posts: 6102
Joined: 27 Nov 2004 15:05
Location: Canada

Re: JGR's Patch Pack

Post by wallyweb »

JGR wrote:
wallyweb wrote:/me echoes
Once Cirdan is back to his environment and is able to rebase from r27220, this would indeed be an interesting endeavour. :D
Cirdan's branch is huge, and makes a *lot* of changes mixed with partial cherry-pickings of trunk. This makes it a bit difficult to work out (in aggregate) what has actually been changed and may need to be merged, and what just hasn't been picked from trunk. These changes aren't just limited to new map features, but there's all sorts of random things which have been heavily modified.
Rebasing on a newer trunk would help (at least in the short term), but then it'd become increasingly difficult to track as it diverged away again. If it was later rebased after I'd merged it it'd also be potentially problematic.
I have to agree with you. A good example is you include HackaLittleBit's "Signals in tunnels and on bridges". Cirdan has a version of this in his fork. It's not to say that things are impossible. I have recently patched HackaLittleBit's "Cut the trees on Everest" into Cirdan's branch.
User avatar
JGR
Tycoon
Tycoon
Posts: 2557
Joined: 08 Aug 2005 13:46
Location: Ipswich

Re: JGR's Patch Pack

Post by JGR »

wallyweb wrote:I have to agree with you. A good example is you include HackaLittleBit's "Signals in tunnels and on bridges". Cirdan has a version of this in his fork. It's not to say that things are impossible. I have recently patched HackaLittleBit's "Cut the trees on Everest" into Cirdan's branch.
It's not impossible, however I don't want to make life unnecessarily difficult for myself, or compromise future maintenance.
As much as possible I'd prefer to keep my branches including this patchpack mergeable with future updates in trunk, and maintain savegame compatibility both with earlier versions of the patchpack/its component feature branches, and with trunk (including future savegame revisions). All of which does add some additional restrictions on how I add features.
The very poor state of savegame compatibility in patchpacks so far was one of the key reasons why I decided to roll my own in the first place. Then again, time will tell how things really pan out with this one.

On an unrelated note, where is the source for your rebase of HackaLittleBit's patch onto cirdan's branch?
Ex TTDPatch Coder
Patch Pack, Github
User avatar
wallyweb
Tycoon
Tycoon
Posts: 6102
Joined: 27 Nov 2004 15:05
Location: Canada

Re: JGR's Patch Pack

Post by wallyweb »

JGR wrote:On an unrelated note, where is the source for your rebase of HackaLittleBit's patch onto cirdan's branch?
Is this what you are looking for?
src.7z
(4.62 MiB) Downloaded 1058 times
moki
Traffic Manager
Traffic Manager
Posts: 131
Joined: 06 Jul 2007 08:48
Location: Wismar, Germany

Re: JGR's Patch Pack

Post by moki »

Just dropping by to say thank you... I've been playing with the Spring 2013 Patch Pack for the last months, but this gives me all the patches I like in a recent version and without too much unneeded stuff :)
It also seems to be stable. At least I didn't encounter any crashes or bugs in the few hours I've been testing it.
User avatar
Mizari
Traffic Manager
Traffic Manager
Posts: 136
Joined: 22 Apr 2012 14:21

Re: JGR's Patch Pack

Post by Mizari »

This seems to have that bug (day-length related) that makes departure boards display erroneous and constantly updating times, as used to happen to Hard Patch-pack before it was fixed.

Also, the time (the minutes, etc) seem to move extremely slow compared to Spring Patch Pack?
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 6 guests