New map features

[wallyweb]

The cooling fan on my developer machine went toasters. It'll be at least three weeks before the new fan arrives and it gets fixed. It´s a specially crafted fan from China, to be delivered by a genuine junk. Good thing is: it´s still in the guarantee period!

Yeah. We simple folk are depending on ordinary no-name fans, from the corner shop.

regards
Michael

My comments are protected under copyright and are not licensed for revision. Please have your lawyer call my lawyer. I want a years worth of fresh baked apple pies in settlement of this blatant transgression.

PS Junks are used to deliver junk?

[cirdan]

I have just pushed a new batch of commits to the repo. The most prominent user-visible changes are:

• You can now select the station to join when building a station part next to several other stations even if distant join is disabled, as shown below. (Bug reported by Andrex.)
• Dock buoys have been merged: You can now build buoys that function as fully fledged docks. They are company-owned and can collect, deliver and transfer cargo. Build them with the dock tool on a flat (non-rapid) water tile. (Feature suggested by wallyweb.)

Compilation under Windows still needs this patch, since I have not reached that far in my development branch with my testing.

I got some warnings for fileio

Code: Select all

(snip)

and networ, but since i am not playing network games i ignore those for now.

Ack, I have fixed those warnings (they are a real bug on 64-bit systems). The fix is not in the repo yet, though. What other warnings are you seeing?

And Cirdan, i loaded successfully a big savegame from 1.4.2 into this last version compiled by wally, it s awesome, working just fine, i notice only a small lag when zooming in and out wich did not occured with 1.4.2, no big deal as the game is running really smooth otherwise, but i just thought i would inform you about it

edit : lag is happening on the two latest zoom out level (more lag on the last zoom out level), and happens especially when moving the view around.

I do not see any lag myself, I am afraid. Does it happen in every game? Do you have a savegame that shows this lag?

[romazoon]

I do not see any lag myself, I am afraid. Does it happen in every game? Do you have a savegame that shows this lag?

well i only imported and tested my last 1.4.2 savegame into your version, and it is a relatively big game (650 stations, 2000 Rv, 860 trains, 300 ships and on a relatively big map).
I retested the savegame on 1.4.2 and confirm some lags when zooming out and scrolling around with your version and the same savegame.

but it s a quite big game...and that lag is not that big. so if i were you i would probably put that problem on "low priority"

[TrueSatan]

I got some warnings for fileio

Code: Select all

(snip)

and networ, but since i am not playing network games i ignore those for now.

Ack, I have fixed those warnings (they are a real bug on 64-bit systems). The fix is not in the repo yet, though. What other warnings are you seeing?

Thats the network warning I get.

Code: Select all

[SRC] Compiling network/network_content.cpp
In file included from /home/computeradvisor/nmf/src/network/network_content.cpp:14:0:
/home/computeradvisor/nmf/src/network/network_content.cpp: In function ‘char* GetFullFilename(const ContentInfo*, bool)’:
/home/computeradvisor/nmf/src/network/../stdafx.h:416:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define lengthof(x) (sizeof(x) / sizeof(x[0]))
                                              ^
/home/computeradvisor/nmf/src/network/network_content.cpp:392:10: note: in expansion of macro ‘lengthof’
  if (n < lengthof(buf)) {
          ^

And attached is the new compiled version g30cbe339 of the current patchstate.
Works fine so far.

Thanks and regards

[wallyweb]

@TrueSatan: Remember this?

Had some trouble to get icu working (I always get cmemory.h is missing at fontcache)

Well, I just got this.

[cirdan]

And I have just pushed yet another bunch of commits. The published branch is now more or less up to date with my development branch. Highlights in this update are:

• Compilation on Windows has been restored restored.
• The town name editbox is properly cleared when generating a random name (reported by Pyoro).
• Scanning of tar files on 64-bit platforms has been fixed (reported by TrueSatan).
• Towns will now use custom bridgeheads when growing (reported by Pyoro).

well i only imported and tested my last 1.4.2 savegame into your version, and it is a relatively big game (650 stations, 2000 Rv, 860 trains, 300 ships and on a relatively big map).
I retested the savegame on 1.4.2 and confirm some lags when zooming out and scrolling around with your version and the same savegame.

but it s a quite big game...and that lag is not that big. so if i were you i would probably put that problem on "low priority"

Thanks, I will try to take a look at your savegame.

Thats the network warning I get.

Code: Select all

[SRC] Compiling network/network_content.cpp
In file included from /home/computeradvisor/nmf/src/network/network_content.cpp:14:0:

Ah, that one. I guess I should fix it sometime...

[aantono]

Trying to build on OSX and getting this compiler error:

Code: Select all

In file included from /Users/aantonov/Development/openttd-dev/fttd/src/fios.h:17:
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:61:35: error: no member named 'unique_ptr' in namespace 'std'
struct Gamelog : std::vector<std::unique_ptr<GamelogEntry> > {
                             ~~~~~^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:61:46: error: 'GamelogEntry' does not refer to a value
struct Gamelog : std::vector<std::unique_ptr<GamelogEntry> > {
                                             ^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:48:8: note: declared here
struct GamelogEntry {
       ^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:61:60: error: expected class name
struct Gamelog : std::vector<std::unique_ptr<GamelogEntry> > {
                                                           ^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:63:9: error: no member named 'push_back' in 'Gamelog'
                this->push_back(std::unique_ptr<GamelogEntry>(entry));
                ~~~~  ^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:63:24: error: no member named 'unique_ptr' in namespace 'std'
                this->push_back(std::unique_ptr<GamelogEntry>(entry));
                                ~~~~~^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:63:35: error: 'GamelogEntry' does not refer to a value
                this->push_back(std::unique_ptr<GamelogEntry>(entry));
                                                ^
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:48:8: note: declared here
struct GamelogEntry {
       ^
1 warning and 6 errors generated.
make[1]: *** [console_cmds.o] Error 1
make: *** [all] Error 1

[Pyoro]

Mhm, well, at least it works as promised on Windows / MinGW. "Bugs" are indeed fixed, thanks

[aantono]

This is the command I'm using to run configure:

Code: Select all

./configure --enable-static --without-liblzo2 --without-freetype --without-osx-sysroot CFLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk" LDFLAGS="-std=c++11 -stdlib=libc++" CC="/usr/bin/llvm-gcc" CXX="/usr/bin/llvm-g++"

But for some reason it looks like it is still not using the right C++ 11 features.

[TrueSatan]

Thanks for the new version Cirdan

but... yeah i know you don't want to see those lol

Code: Select all

[SRC] Compiling elrail.cpp
/home/computeradvisor/nmf/src/elrail.cpp: In function ‘void DrawCatenaryRailway(const TileInfo*)’:
/home/computeradvisor/nmf/src/elrail.cpp:574:34: warning: ‘sprite_halftile’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    IsTransparencySet(TO_CATENARY));
                                  ^
[SRC] Compiling network/network_content.cpp
In file included from /home/computeradvisor/nmf/src/network/network_content.cpp:14:0:
/home/computeradvisor/nmf/src/network/network_content.cpp: In function ‘char* GetFullFilename(const ContentInfo*, bool)’:
/home/computeradvisor/nmf/src/network/../stdafx.h:420:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define lengthof(x) (sizeof(x) / sizeof(x[0]))
                                              ^
/home/computeradvisor/nmf/src/network/network_content.cpp:392:10: note: in expansion of macro ‘lengthof’
  if (n < lengthof(buf)) {
          ^

Thats the compile warnings/error is get with g4f6bfe58

Cheers

[romazoon]

Normaly when we build a road stop it's automaticly link to neighbours road, but this do not work to connect to a bridgehead. it s not a big thing Imho to have to build the road manually, but since i read that towns are (in your latest version) able to use the bridgehead, i thought it s maybe a bug you also want to tackle

and sorry, but in addition I have a crash report. I was using the last window binary made by Wally.

*** OpenTTD Crash Report ***

Crash at: Thu Oct 02 15:02:56 2014
In game date: 1992-05-16 (0)

Crash reason:
Exception: E1212012
Location: 75A8C42D
Message: Assertion failed at line 79 of C:/MinGW/msys/1.0/home/Adminguy/fttd/src/script/api/../../map/../tile/road.h: tile_is_road(t) || tile_is_crossing(t) || tile_is_road_tunnel(t) || tile_is_road_depot(t) || tile_is_station(t)

Binary:
Version: gd8c25d3aM (2)
NewGRF ver: 150064d0
Build date: Sep 23 2014 09:59:12

Flags: 32-bit little-endianRegisters:
EAX: 0028ACC4 EBX: 00000016 ECX: 00000000 EDX: 0008E3C8
ESI: 77413180 EDI: 00000000 EBP: 0028AD14 ESP: 0028ACC4
EIP: 75A8C42D 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 75A8C42D 00000000 0028ACF8 7748FCF1 003706B2
774164A8 773C03E0 00012010 00000000 FFFFFFFF 0028AD14 7748FD36 003706B2
77E9FAEA 77EC1092 FFFFFFFF 00000024 0028AD80 0053C5FB E1212012 00000000
00000000 00000000 77410290 0028AD80 773D5E89 773D5E8F 00000016 6439CF82
000000C0 0000000C 0028B0D0 77E9FAEA 77EB9DEC 00000000 00000024 0053C5D4
00000001 0028AD40 0028A6EC 0028FFC4 77398CD5 132C3CBA FFFFFFFE 0028B0B8
773D8EA2 00000016 0000000C 002F0776 01339938 0133CC48 0004002D 00000062
00000000 010001C8 00000000 00000310 01010000 0028ACF0 7745CF5C 0028FFC4
77EF71F5 218CE637 FFFFFFFE 77EB38AA 77EB34A2 00000000 01339938 00010003
00000000 0028AFFC 01339930 0028AE98 7748F774 012C0000 00000000 01339938
00000001 0028AFFC 00000001 0000001F 0000000D 00000000 00DC1F80 00000010
003706B2 011B3770 00000006 00000000 00000000 00000556 00000300 00000000
0000013D 0028AFFC 000001DB 00000000 00007F01 00000000 00000001 00000034
50022080 00000032 00000020 00000000 00000000 0000019F 77EAE046 01339938
015411D8 00000000 0133999C 01541244 0000012D 0028AFF0 7748FA18 00000010
000000C0 0000000C 7748FA50 00000001 0028AEF0 00000001 00000000 01253270
00000000 01540E04 0049525D 00000009 0000001B 00000000 00000000 7748FA6C
00000000 00000001 00000000 7FFFFFFF 00963249 0028AF28 7738AA42 00381B5D
00963249 00000016 00000016 7FFFFFFF 00000000 77412BD0 003814B8 7737A53A
00002700 0028AF58 7738A8C1 00381B5D 00963249 00000016 0028AF48 7FFFFFFF
00000000 77412BD0 003814B8 003807D0 00002700 0028AF88 7738A9C8 00381B5D
0000000A 00000016 00000000 00381728 00381B5E 77412BD0 00000007 00000000
0028AFA2 0028AFA0 006DDA63 00000007 0000007F 0028B0D0 00DC1F80 00000200
0028B1AD 0028AFCC 75AB583B 00DC1F80 00000000 0028AFC8 00DC212C 00DC2380

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

Configuration:
Blitter: 32bpp-anim
Graphics set: original_windows (0)
Language: C:\Users\andylu\Desktop\Spiel\OTTD Newmapfeature\OpenTTD-gd8c25d3aM-Win32\lang\french.lng
Music driver: win32
Music set: Modern Motion (1)
Network: no
Sound driver: win32
Sound set: NoSound (2)
Video driver: win32

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

AI Configuration (local: 0):
0: Human
1: Terron (v209)
GS: Neighbours are important (v16)

Libraries:
FreeType: 2.4.10
LZMA: 5.0.4
LZO: 2.06
PNG: 1.5.16
Zlib: 1.2.8

Module information:
C:\Users\andylu\Desktop\Spiel\OTTD Newmapfeature\OpenTTD-gd8c25d3aM-Win32\openttd.exe handle: 00400000 size: 11004922 crc: 669F0446 date: 2014-09-23 13:04:26
C:\Windows\SysWOW64\ntdll.dll handle: 77e80000 size: 1292192 crc: 87C3B42F date: 2013-08-29 01:50:30
C:\Windows\syswow64\kernel32.dll handle: 76360000 size: 1114112 crc: 8F4ED6D1 date: 2014-03-04 09:16:17
C:\Windows\syswow64\KERNELBASE.dll handle: 75a80000 size: 274944 crc: D5B7EFFE date: 2014-03-04 09:16:18
C:\Windows\syswow64\ADVAPI32.DLL handle: 762c0000 size: 640512 crc: 939A0B41 date: 2013-08-29 01:48:17
C:\Windows\syswow64\msvcrt.dll handle: 77370000 size: 690688 crc: DAB48B3A date: 2011-12-16 07:52:58
C:\Windows\SysWOW64\sechost.dll handle: 758d0000 size: 92160 crc: B624B29A date: 2009-07-14 01:16:13
C:\Windows\syswow64\RPCRT4.dll handle: 75d60000 size: 664064 crc: 358EDEDF date: 2014-07-14 01:40:58
C:\Windows\syswow64\SspiCli.dll handle: 75870000 size: 96768 crc: 59B0F372 date: 2014-07-07 01:39:16
C:\Windows\syswow64\CRYPTBASE.dll handle: 75860000 size: 36864 crc: 00308E17 date: 2009-07-14 01:15:07
C:\Windows\syswow64\GDI32.dll handle: 779f0000 size: 311808 crc: 8EF3EF88 date: 2014-08-23 01:45:55
C:\Windows\syswow64\USER32.dll handle: 77420000 size: 833024 crc: 9EFE504D date: 2010-11-20 12:08:58
C:\Windows\syswow64\LPK.dll handle: 75d30000 size: 25600 crc: 3A7246AE date: 2013-06-06 04:57:01
C:\Windows\syswow64\USP10.dll handle: 75ad0000 size: 626688 crc: 7CF1A954 date: 2014-04-25 02:06:17
C:\Windows\syswow64\IMM32.DLL handle: 777a0000 size: 119808 crc: 38DB5163 date: 2010-11-20 12:08:52
C:\Windows\syswow64\MSCTF.dll handle: 75f90000 size: 828928 crc: DFE09EEB date: 2009-07-14 01:15:43
C:\Windows\syswow64\SHELL32.DLL handle: 76720000 size: 12874240 crc: C247DBF4 date: 2014-06-25 01:41:30
C:\Windows\syswow64\SHLWAPI.dll handle: 75f30000 size: 350208 crc: 23E05F73 date: 2010-11-20 12:21:20
C:\Windows\system32\WINMM.DLL handle: 74390000 size: 194048 crc: 849223C7 date: 2010-11-20 12:21:38
C:\Windows\syswow64\WS2_32.dll handle: 779b0000 size: 206848 crc: FD00A753 date: 2010-11-20 12:21:40
C:\Windows\syswow64\NSI.dll handle: 76060000 size: 8704 crc: 2ACE9671 date: 2009-07-14 01:16:11
C:\Windows\SysWOW64\nvinit.dll handle: 75700000 size: 146480 crc: 174445EB date: 2014-07-02 20:48:32
C:\Program Files (x86)\NVIDIA Corporation\CoProcManager\detoured.dll handle: 0f000000 size: 13272 crc: 3596E0E8 date: 2014-07-02 20:48:32
C:\Program Files (x86)\NVIDIA Corporation\CoProcManager\nvd3d9wrap.dll handle: 74360000 size: 164496 crc: 26D29F6C date: 2014-07-02 20:48:32
C:\Windows\syswow64\SETUPAPI.dll handle: 760e0000 size: 1667584 crc: 1D0104E8 date: 2010-11-20 12:21:16
C:\Windows\syswow64\CFGMGR32.dll handle: 776f0000 size: 145920 crc: 377B5190 date: 2011-10-19 03:07:08
C:\Windows\syswow64\OLEAUT32.dll handle: 75c90000 size: 571904 crc: 2B85E126 date: 2011-08-27 04:26:27
C:\Windows\syswow64\ole32.dll handle: 75910000 size: 1414144 crc: 74A1E844 date: 2010-11-20 12:20:50
C:\Windows\syswow64\DEVOBJ.dll handle: 758f0000 size: 64512 crc: 66B02A5A date: 2011-10-19 03:07:08
C:\Program Files (x86)\NVIDIA Corporation\CoProcManager\nvdxgiwrap.dll handle: 74340000 size: 113008 crc: A54B2121 date: 2014-07-02 20:48:32
C:\Windows\system32\mswsock.dll handle: 72960000 size: 231424 crc: 2A2905A9 date: 2013-09-08 02:03:58
C:\Windows\System32\wshtcpip.dll handle: 728e0000 size: 9216 crc: BA963A19 date: 2009-07-14 01:16:20
C:\Windows\system32\MMDevAPI.DLL handle: 74300000 size: 213504 crc: 93C0AA4F date: 2010-11-20 12:19:40
C:\Windows\system32\PROPSYS.dll handle: 72b10000 size: 988160 crc: 888D0BCB date: 2010-11-20 12:20:58
C:\Windows\system32\wdmaud.drv handle: 6bed0000 size: 172032 crc: D5B9F5FA date: 2010-11-20 12:16:52
C:\Windows\system32\ksuser.dll handle: 71200000 size: 4608 crc: EBE07232 date: 2009-07-14 01:15:35
C:\Windows\system32\AVRT.dll handle: 72850000 size: 14336 crc: 9818237B date: 2009-07-14 01:14:58
C:\Windows\system32\AUDIOSES.DLL handle: 742c0000 size: 195584 crc: 0A7E52B1 date: 2010-11-20 12:18:06
C:\Windows\system32\msacm32.drv handle: 6c7e0000 size: 20992 crc: 73923147 date: 2009-07-14 01:14:08
C:\Windows\system32\MSACM32.dll handle: 71580000 size: 72192 crc: ABA25814 date: 2009-07-14 01:15:42
C:\Windows\system32\midimap.dll handle: 6c5f0000 size: 16896 crc: C000494C date: 2009-07-14 01:15:40
C:\Windows\syswow64\CLBCatQ.DLL handle: 75e50000 size: 522240 crc: 6C130B8A date: 2009-07-14 01:15:03
C:\Windows\System32\wship6.dll handle: 699d0000 size: 10752 crc: 99DFC9DA date: 2009-07-14 01:16:20
C:\Windows\system32\DNSAPI.dll handle: 69980000 size: 270336 crc: 93875418 date: 2011-10-19 02:49:31
C:\Program Files (x86)\Common Files\Microsoft Shared\Windows Live\WLIDNSP.DLL handle: 64370000 size: 145280 crc: DBDF337A date: 2011-03-29 03:31:14
C:\Windows\syswow64\PSAPI.DLL handle: 76070000 size: 6144 crc: 25B988F9 date: 2009-07-14 01:16:12
C:\Windows\system32\IPHLPAPI.DLL handle: 72d30000 size: 103936 crc: E8D425A2 date: 2010-11-20 12:19:24
C:\Windows\system32\WINNSI.DLL handle: 74700000 size: 16896 crc: 484CAF17 date: 2009-07-14 01:16:19
C:\Windows\System32\fwpuclnt.dll handle: 64320000 size: 216576 crc: 881C7EC0 date: 2013-10-12 02:01:25
C:\Windows\system32\rasadhlp.dll handle: 64360000 size: 11776 crc: C799823B date: 2009-07-14 01:16:12

---- gamelog start ----
Tick 0: Load game
Conversion from new TTDP savegame version 0.0.0.23552
Revision text changed to 0.7.0 (legacy), savegame version 116, not modified, newgrf version 0x07083e29
New game mode 2, landscape 2
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0-beta2 (legacy), savegame version 135, not modified, newgrf version 0x1000492f
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0-beta3 (legacy), savegame version 136, not modified, newgrf version 0x100849b7
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0-beta4 (legacy), savegame version 138, not modified, newgrf version 0x10004a40
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0 (legacy), savegame version 138, not modified, newgrf version 0x10084c4a
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0-beta4 (legacy), savegame version 138, not modified, newgrf version 0x10004a40
Game loaded
Tick 0: Load game
Revision text changed to 1.0.2 (legacy), savegame version 138, not modified, newgrf version 0x10284e20
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0-beta4 (legacy), savegame version 138, not modified, newgrf version 0x10004a40
Game loaded
Tick 0: Load game
Revision text changed to 1.0.2 (legacy), savegame version 138, not modified, newgrf version 0x10284e20
Game loaded
Tick 0: Load game
Revision text changed to 1.0.0-beta4 (legacy), savegame version 138, not modified, newgrf version 0x10004a40
Game loaded
Tick 0: Load game
Revision text changed to 1.0.2 (legacy), savegame version 138, not modified, newgrf version 0x10284e20
Game loaded
Tick 0: Load game
Revision text changed to 1.0.5 (legacy), savegame version 138, not modified, newgrf version 0x1058531e
Game loaded
Tick 0: Load game
Revision text changed to 1.1.1 (legacy), savegame version 160, not modified, newgrf version 0x11185800
Game loaded
Tick 0: Load game
Revision text changed to 1.2.0-beta3 (legacy), savegame version 170, not modified, newgrf version 0x12005d19
Game loaded
Tick 0: Load game
Revision text changed to 1.2.0 (legacy), savegame version 174, not modified, newgrf version 0x12085e36
Game loaded
Tick 0: Load game
Revision text changed to 1.4.0 (legacy), savegame version 188, not modified, newgrf version 0x14086748
Game loaded
Tick 0: Setting 'order.improved_load' changed from 0 to 1
Tick 0: Setting 'economy.station_noise_level' changed from 0 to 1
Tick 0: Setting 'economy.station_noise_level' changed from 1 to 0
Tick 0: Setting 'vehicle.plane_speed' changed from 4 to 3
Tick 0: Setting 'vehicle.plane_speed' changed from 3 to 2
Tick 0: Setting 'vehicle.plane_speed' changed from 2 to 1
Tick 0: Setting 'vehicle.dynamic_engines' changed from 0 to 1
Tick 0: Setting 'vehicle.wagon_speed_limits' changed from 1 to 0
Tick 0: Setting 'vehicle.freight_trains' changed from 1 to 2
Tick 0: Setting 'vehicle.freight_trains' changed from 2 to 3
Tick 0: Setting 'vehicle.freight_trains' changed from 3 to 2
Tick 0: Setting 'vehicle.freight_trains' changed from 2 to 1
Tick 0: Setting 'construction.max_bridge_length' changed from 64 to 99
Tick 0: Setting 'construction.max_tunnel_length' changed from 64 to 150
Tick 0: Setting 'construction.max_tunnel_length' changed from 150 to 99
Tick 0: Setting 'construction.command_pause_level' changed from 1 to 3
Tick 0: GRF config change
Added NewGRF: GRF ID F1250005, checksum 71231BAE6D5F4A5878933ADB74CABEE5, filename: firs_industry_replacement_set-1.3.0\firs.grf (md5sum matches)
Added NewGRF: GRF ID 4F472B32, checksum 3FD44FD23CAC8D29AA314BF6A304B684, filename: opengfx_road_vehicles-0.4.0\ogfx-rv.grf (md5sum matches)
Added NewGRF: GRF ID 4F472B31, checksum 4E0B2D42462F295F36AFBA90D239A323, filename: opengfx_trains-0.3.0\ogfx-trains.grf (md5sum matches)
Added NewGRF: GRF ID 6D620004, checksum E626EC7380EBA302AD806D02D63C2305, filename: newships.grf (md5sum matches)
GRF config change end
Tick 0: Load game
Revision text changed to gd8c25d3aM, savegame version 20, modified, newgrf version 0x150064d0
Game loaded
Tick 0: GRF config change
Removed NewGRF: GRF ID 4F472B32, filename: opengfx_road_vehicles-0.4.0\ogfx-rv.grf (md5sum matches)
Removed NewGRF: GRF ID 4F472B31, filename: opengfx_trains-0.3.0\ogfx-trains.grf (md5sum matches)
Added NewGRF: GRF ID 6D620C00, checksum D1A921AD8FBE33D657C644F47C9A71C1, filename: marico.grf (md5sum matches)
Added NewGRF: GRF ID 414E0201, checksum 809D7424C8CEFC9DDC8E0AE4F64D79AB, filename: fish_2-squidrc8\fish.grf (md5sum matches)
Added NewGRF: GRF ID 6D620601, checksum 537A2B9E5F0644BC360248B2B802D086, filename: newstats.grf (md5sum matches)
Added NewGRF: GRF ID 44508550, checksum C36718E11CA087D3B8EC56071835A277, filename: sbb_set-1.0\sbbset.grf (md5sum matches)
Added NewGRF: GRF ID 4D656F17, checksum 8A4F8A04256C90BECF818D134C91C816, filename: long_vehicles-v404oct2008\4lvw.grf (md5sum matches)
Added NewGRF: GRF ID 4D560000, checksum A420B01EE556C4C8EC7E8A59E4CC05DB, filename: Ikarus_Set-6beta\TESTFILEw.GRF (md5sum matches)
Added NewGRF: GRF ID 44550001, checksum B781E3495091FA6B5DE79472FD4A61A5, filename: German RV Newgrf\germanrvw.grf (md5sum matches)
Added NewGRF: GRF ID 53455230, checksum 006C9A29A9AA2FCC5CD1C331D8133655, filename: swedish_rails-0.7.4\swedishrails.grf (md5sum matches)
Added NewGRF: GRF ID 74677462, checksum 1D2A4E03D9F30922788C166254C27619, filename: total_bridge_renewal_set-1.2\total_bridges.grf (md5sum matches)
Added NewGRF: GRF ID 444E0800, checksum 334F8C4697455569073434DB107F864A, filename: vast_objects-0.3.0\vastobjects.grf (md5sum matches)
GRF config change end
Tick 0: GRF config change
Added NewGRF: GRF ID 41533031, checksum F3A0A556505B7A94733D85B892C2070C, filename: swedish_houses-1.1.1\swehouses.grf (md5sum matches)
GRF config change end
Tick 0: Load game
New game mode 1, landscape 2
Game loaded
Tick 38: Setting 'economy.allow_town_roads' changed from 1 to 0
Tick 38: Setting 'economy.allow_town_level_crossings' changed from 1 to 0
Tick 22942: GRF config change
Added NewGRF: GRF ID 4E474C56, checksum B780A10427B64320EE8529AD9711868E, filename: light_road_vehicle_set-0.2beta2\lrvs-0.2.grf (md5sum matches)
GRF config change end
Tick 45657: GRF config change
Added NewGRF: GRF ID 24251D2C, checksum D651DD34D8F6F27712B309A693860859, filename: n_tesztl(1)w.GRF (md5sum matches)
GRF config change end
---- gamelog end ----

*** End of OpenTTD Crash Report ***

[aantono]

This is the command I'm using to run configure:

Code: Select all

./configure --enable-static --without-liblzo2 --without-freetype --without-osx-sysroot CFLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk" LDFLAGS="-std=c++11 -stdlib=libc++" CC="/usr/bin/llvm-gcc" CXX="/usr/bin/llvm-g++"

But for some reason it looks like it is still not using the right C++ 11 features.

Does anyone has any suggestions on what/how should be changed to get the proper compiler configuration to be used on OSX 10.9.5?

[cirdan]

and sorry, but in addition I have a crash report. I was using the last window binary made by Wally.

Do not be sorry, if there is a bug I certainly want to hear of it.

The bug is that the script code was calling GetRoadTypes on non-road tiles, and this must have been triggered by either the AI or the script in your game. This works in OpenTTD, where GetRoadTypes would just return random garbage, but my branch has stricter checks. Can you test if the attached patch fixes the problem?

Normaly when we build a road stop it's automaticly link to neighbours road, but this do not work to connect to a bridgehead. it s not a big thing Imho to have to build the road manually, but since i read that towns are (in your latest version) able to use the bridgehead, i thought it s maybe a bug you also want to tackle

Ah, good catch. I will look into this.

Code: Select all

[SRC] Compiling network/network_content.cpp
In file included from /home/computeradvisor/nmf/src/network/network_content.cpp:14:0:
/home/computeradvisor/nmf/src/network/network_content.cpp:
    In function ‘char* GetFullFilename(const ContentInfo*, bool)’:
/home/computeradvisor/nmf/src/network/../stdafx.h:420:46:
    warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define lengthof(x) (sizeof(x) / sizeof(x[0]))
                                              ^
/home/computeradvisor/nmf/src/network/network_content.cpp:392:10:
    note: in expansion of macro ‘lengthof’
  if (n < lengthof(buf)) {
          ^

I have finally fixed this one in my development branch...

Code: Select all

[SRC] Compiling elrail.cpp
/home/computeradvisor/nmf/src/elrail.cpp:
    In function ‘void DrawCatenaryRailway(const TileInfo*)’:
/home/computeradvisor/nmf/src/elrail.cpp:574:34:
    warning: ‘sprite_halftile’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    IsTransparencySet(TO_CATENARY));
                                  ^

...but this one is a false positive. The variable is never used uninitialised, although gcc is not clever enough to see it.

Trying to build on OSX and getting this compiler error:

Code: Select all

In file included from /Users/aantonov/Development/openttd-dev/fttd/src/fios.h:17:
/Users/aantonov/Development/openttd-dev/fttd/src/gamelog.h:61:35: error: no member named 'unique_ptr' in namespace 'std'
struct Gamelog : std::vector<std::unique_ptr<GamelogEntry> > {
                             ~~~~~^

You need support for std::unique_ptr in your compiler, which in turns requires support for r-value references and move constructors. If you do not have std::unique_ptr, but do have std::shared_ptr, you can get away by replacing the former with the latter in the two only occurrences in the code, in gamelog.h.

[romazoon]

Thanks Cirdan for the quick fix.

i d be happy to test that patch, but i guess first i have to make a donation call for the actual windows binary furnisher, Wally. I heard recently the dude need a new fan

[wallyweb]

i have to make a donation call for the actual windows binary furnisher, Wally. I heard recently the dude need a new fan

What? You want to join my fan club?
In the meanwhile, I resurrected my old Dell Optiplex (2003) which has an amazing 2GHz Celeron CPU, but alas, it is only a single core. I can't believe that I once thought that it was an incredibly fast machine. I am in the process (dirty word) of setting up MinGW. If I can complete the task today, you should have a binary by tonight.

[romazoon]

What? You want to join my fan club?

i'm your devoted fan since you kindly provide windows binary for us folks

If I can complete the task today, you should have a binary by tonight.

if you need an administrator for your fan club, i'm your man

[aantono]

Tried replacing "unique_ptr" with "shared_ptr", but that didn't solve the compilation problem on the Mac.
I know that it needs to have C++ version 11 to use, just not sure how to properly setup the "configure" script to get the right version wired.

Does anyone has any suggestions???

[cirdan]

I have updated my branch again. Changes include fixes for a crash when an AI tries to build a road and for autobuilding connecting road pieces to a bridge head (both reported by romazoon).

I have also rearranged the autoreplace GUI slightly, particularly for trains. I never use autoreplace except for debugging, and I always found the autoreplace window somewhat confusing. Feel free to complain if you think that it is worse now than it was before.

Tried replacing "unique_ptr" with "shared_ptr", but that didn't solve the compilation problem on the Mac.
I know that it needs to have C++ version 11 to use, just not sure how to properly setup the "configure" script to get the right version wired.

Does anyone has any suggestions???

What compiler (and version) are you using? Does it help to say 'std::tr1::shared_ptr' instead of 'std::unique_ptr'? (There is at least one compiler version out there for which this works).

[TrueSatan]

And here is the compiled Ubuntu version

Seen now, that I could set a flag to avoid those warnings about maybe uninitialized vars.

Thanks again for the fast fixes and the new versoin Cirdan

If I ever find the time I will investigate in a crash that happens
if you try to delete a tunnel while a train is inside.
Strange thing it doesn't always happen.
I can only provide the crash with my current scenario.
But I guess there are to many newgfrs you don't have.

Cheers

[aantono]

What compiler (and version) are you using? Does it help to say 'std::tr1::shared_ptr' instead of 'std::unique_ptr'? (There is at least one compiler version out there for which this works).

Unfortunately that did not help.
I am using a standard OSX compiler. Not exactly sure about the version though. Here is the output of my ./configure call:

Code: Select all

./configure --enable-static --without-liblzo2 --without-freetype --without-osx-sysroot CFLAGS="-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk" LDFLAGS="-std=c++11 -stdlib=libc++" CC="/usr/bin/llvm-gcc" CXX="/usr/bin/llvm-g++" 
checking awk... awk
detecting OS... OSX
checking build system type... x86_64-apple-darwin13.4.0
checking host system type... x86_64-apple-darwin13.4.0
checking universal build... no
checking build cc... /usr/bin/llvm-gcc
checking host cc... /usr/bin/llvm-gcc
checking build c++... /usr/bin/llvm-g++
checking host c++... /usr/bin/llvm-g++
checking strip... disabled
checking builtin depend... yes
checking makedepend... disabled
detecting cpu-type... 64 bits
detecting SSE... found
checking static... yes
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... disabled
WARNING: liblzo2 was not detected or disabled
WARNING: OpenTTD doesn't require liblzo2, but it does mean that
WARNING: loading old savegames/scenarios will be disabled.
WARNING: We strongly suggest you to install liblzo2.
checking libxdg-basedir... not found
checking libpng... found
checking libfreetype... disabled
checking libfontconfig... no freetype, skipping
checking libicu... 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... git detection
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 -D_FORTIFY_SOURCE=2 -O1
using CXXFLAGS_BUILD... 
using LDFLAGS_BUILD... 
using CFLAGS...  -O2 -fomit-frame-pointer -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -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 -D_FORTIFY_SOURCE=2 -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.0.5/include   -DLZMA_API_STATIC -D_SQ64 -I/Users/aantonov/Development/openttd-dev/fttd/src/3rdparty/squirrel/include -DWITH_PNG -I/usr/local/Cellar/libpng/1.6.10/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 -lz -L/usr/local/Cellar/xz/5.0.5/lib -llzma -D_THREAD_SAFE -pthread   /usr/local/Cellar/libpng/1.6.10/lib/libpng.a -L/usr/local/Cellar/libpng/1.6.10/lib  -lz  -liconv  -std=c++11 -stdlib=libc++ -framework Cocoa
Generating Makefile...
Generating lang/Makefile...
Generating setting/Makefile...
Generating grf/Makefile...
Generating objs/Makefile...

Running

Code: Select all

/usr/bin/llvm-g++ --version

returns

Code: Select all

/usr/bin/llvm-g++ --version
Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn)
Target: x86_64-apple-darwin13.4.0
Thread model: posix