New map features

[AlexG]

...and lack of knowledge on how it should be done correctly without creating bugs (and ignoring red warnings)
It seems, even I'm playing ottd since it was released (version 0.0.1 to 1.3.0), I know to little...

Thank again!
Good night

[cirdan]

Time for an update. Noteworthy changes:

- Fixed a bug when reversing trains on a bridge. A train that was manually reversed on a bridge would start to run in the new direction without first trying to reserve a path, which could lead to a collision with another train.

- Signals on tunnelheads! You can now build signals on tunnelheads, albeit with strong limitations: You can only build one-way normal signals, and both ends of a tunnel are linked together, so that both must have a signal if either of them has, and they must face the same direction.

The rationale behind this limitation is that a long stretch of track, such as a tunnel, does not really benefit from signal variety. First of all, it is not really useful to have a two-way tunnel with signals, since it is prone to deadlock. There are some two-way signal combinations that could make sense in a tunnel, but they are not worth the hassle, so I settled for one-way tunnels if you want signals. Second, once that signals have to be one-way, it is only logical that all (both, in this case) signals face the same way. Last, it can be proven that on a track block with no junctions, a normal signal is as good as a path signal, so it is not a great loss if path signals are not available, either. (This is not entirely true for signals on the _ends_ of a stretch of track, as is the case with a tunnel, because it makes sense to place a path signal at the exit of the tunnel. This is something that could be improved later.)

Note that the current implementation of signals on tunnelheads is extremely hackish, and should be regarded as a proof of concept rather than a finished work. Comments and suggestions are welcome, as always. I am particularly interested in your opinion about the drawing of the signals. I have taken the shortest path of just borrowing the signal drawing code for the signal into the tunnel, and skipping the signal out of it altogether; as a consequence, even the signal that is drawn does not always look good, or is visible at all.

My plans for the future involve allowing more than one train in a tunnel at the same time: the signal towards the tunnel will turn green as soon as the train inside is sufficiently far away from the entrance, to allow a second train in; this second train will slow down to match its pace with the train ahead should it come too close, so they do not crash.

There is also a big not-so-visible change in this patch: I have rearchitected the build system for MSVC compilers, so that object files are output under the same directory hierarchy that the source files. Help testing this new system would be greatly appreciated: If you feel like doing so, compiling OpenTTD with the attached patch under MSVC and reporting whether the build succeeded (and the resulting binary runs, of course) or what problems you found is all that is required. Ideally, I would like successful build reports for all three supported versions of the MSVC compiler (2005, 2008 and 2010), but I could do with just 2010 and one of the other two, since they use the same project file.

[Supercheese]

Successful compile using VC++ 2008, no problems encountered. Win32 binary package attached -- this time without any modifications for newgrf limits.

Of course, I can also post a version with the increased limits if people want.

[AlexG]

Something changed in loading savegames ?
I can't load savegame from 25136 to 25238

Game Load Failed
Broken savegame - Referencing invalid
PersistentStorage

An version with no limit newgrf would be awesome
Maybe that's the reason for my error.

[cirdan]

Successful compile using VC++ 2008, no problems encountered. Win32 binary package attached -- this time without any modifications for newgrf limits.

Thanks!

Something changed in loading savegames ?
I can't load savegame from 25136 to 25238

Nothing, as far as I know...

Game Load Failed
Broken savegame - Referencing invalid
PersistentStorage

...but this is not the first time that this PersistentStorage thing pops up. Still, I cannot imagine how it could be related to my patch. Perhaps it is a bug elsewhere? Can you still load the savegame with a previous binary? If so, it may help to provide your savegame so I can have a look at it.

[AlexG]

Yes, it does work in other previous savegames
I have over the limit (100+ newgrf) and when I want to start a fresh new game, it says I have to many)...

Here is my saved game:

[wallyweb]

Is there a status list of the new map features "planned/in progress/done" for this patch?

[Supercheese]

Yes, it does work in other previous savegames
I have over the limit (100+ newgrf) and when I want to start a fresh new game, it says I have to many)...

Ach, I shouldn't have bucked the trend and changed the binaries I posted regarding newgrf limits. Here's a binary with raised grf limits once again.

[planetmaker]

Yes, it does work in other previous savegames
I have over the limit (100+ newgrf) and when I want to start a fresh new game, it says I have to many)...

Ach, I shouldn't have bucked the trend and changed the binaries I posted regarding newgrf limits. Here's a binary with raised grf limits once again.

Raised NewGRF limit breaks multiplayer. You don't do a favour wrt testing when adding known problematic hacks.

[AlexG]

I'm sorry but it doesn't change anything

[Supercheese]

Raised NewGRF limit breaks multiplayer. You don't do a favour wrt testing when adding known problematic hacks.

Well, I'll continue to post both versions, I guess. I very much like having more than 64 grfs, and I've only ever played multiplayer once or twice anyway -- and of course this already being a patchpack the multiplayer options are severely limited.

[Eddi]

wtf kind of statement is that?!? "this patch shouldn't be tested in multiplayer anyway"?!?


honestly, it was a silly idea to include that hack in the first place. it's a known broken feature and should not be spread.

[Supercheese]

The whole point for me to compile custom versions of OTTD is to include things that I can't get in trunk; I happen to enjoy this patchpack especially, on top of the other tweaks I apply to the OTTD source, as do other people such as Sadguardian, it seems. My posting binaries here is just gravy. If I was the author of a patch like this one, of course I'd try to keep binaries as "hack-free" as possible.

[cirdan]

Here is my saved game:

I am sorry, but I have had to give up trying to load your savegame. I cannot even get to the point of actual loading, because I am missing lots of newgrfs that I cannot seem to find.

Is there a status list of the new map features "planned/in progress/done" for this patch?

There is a list in the first post with features actually implemented. It does not contain minor fixes or improvements, and it currently lacks signals on tunnelheads, because they are still beta code, but otherwise it is the "canonical" list of completed features. Signals in tunnels is the only feature in progress, and at the moment is on hold, because I am reworking the track follower. As for planned features, the only features that I accounted for when I designed the new map array but are still unimplemented are signals in tunnels (in progress), signals on bridges and custom tunnelheads. However, while there is a fair chance that I eventually code signals on bridges, I would not hold my breath for custom tunnelheads.

[wallyweb]

Is there a status list ... ?

There is a list ...

Thanks for the reply. It is greatly appreciated.

I would not hold my breath for custom tunnelheads.

I am unable to hold my tears.
Understandable. This was one of the last features to appear in TTDP and was arguably one of the most challenging for Oskar (eis-os) to implement. Hopefully when all else is done, a solution will become apparent when it gets dedicated focus, perhaps it's own patch so as to not hold up the things that work.

Thank you for improving the game.

[AlexG]

It's ok Cirdan
Maybe on the next release, it will work
The only thing I'm asking for is not to give up for no limit newGRF and departure boards...and if it's possible, to expand and make more complex (departure boards).

Thanks and keep the work going, guys

[wallyweb]

Ach, I shouldn't have bucked the trend and changed the binaries I posted regarding newgrf limits. Here's a binary with raised grf limits once again.

I finally got around to trying to play a new game.

OTTD v1.3.1 stable
and
openttd-newmapfeatures-r25136-win32.7z
both worked fine.

Using the exact same group of GRFs,
while trying to build a station,
the game crashed in both
openttd-newmapfeatures-r25238-win32.7z
and
openttd-newmapfeatures-raisedgrflimit-r25238-win32.7z

Code: Select all

*** OpenTTD Crash Report ***

Crash at: Sun Jun 30 04:25:59 2013
In game date: 1921-01-01 (0)

Crash reason:
 Exception: E1212012
 Location:  76D6C41F
 Message:   Assertion failed at line 85 of c:\users\iain\desktop\ottd working\ottd source\src\station_func.h: IsRailStationTile(station_tile)

OpenTTD version:
 Version:    r25238M (2)
 NewGRF ver: 14006296
 Bits:       32
 Endian:     little
 Dedicated:  no
 Build date: May 13 2013 12:35:41

Registers:
 EAX: 0018ED10 EBX: 00000016 ECX: 00000000 EDX: 0008E3C8
 ESI: 00CC3160 EDI: 00000000 EBP: 0018ED60 ESP: 0018ED10
 EIP: 76D6C41F 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 76D6C41F 00000000 0018EE14 778B38BE 00E20138
 778B389A 76148587 00000000 00E20000 7789FACA 778C1022 FFFFFFFF 00000024
 0018ED5C 00000004 00000000 00000016 0018EDC0 0064747D E1212012 00000000
 00000000 00000000 0071C3B8 00000016 C1B854EF 0018F108 00000200 11041FC8
 778B9D6C FFFFFFFF 00000000 0018EDA8 0064746D 00000001 0018ED80 0018E8D4
 0018F384 00722600 C168462F FFFFFFFE 0018F0F8 0071B84C 00000016 00000200
 00000001 002705BC 00E7F118 00E7F8F8 00080024 00000042 00000000 010001C9
 00000000 00000210 01010000 0018ED34 76A8CF5C 0018F384 778F71D5 0186A3C3
 FFFFFFFE 778B389A 778B3492 00000000 00E7F118 00010003 00000000 0018F040
 00E7F110 0018EEDC 76ABF774 00E20000 00000000 00E7F118 00000001 0018F040
 00000001 00000028 00000015 00000000 00D29FA0 00000010 003E0570 00000000
 00000006 00000000 00000000 00000500 000002F8 00000000 0000011C 0018F040
 000001C1 00000000 00007F01 00000000 00000001 00000027 50022080 00000032
 00000020 00000000 00000000 0000017E 00000000 00E7F118 010A11D8 00000000
 00E7F17C 010A1244 0000012D 0018F034 76ABFA18 00000010 0018F108 00000200
 76ABFA50 00000001 0018F747 00000000 00000000 00000000 00000000 010A0E04
 0018EF48 00000000 0018EF40 00000000 00000000 76ABFA6C 00000000 00000001
 00000000 00000000 00000000 00000000 0018F74C 0042271C 528781EE 206C6961
 74617453 206E6F69 656C6553 6F697463 0018006E 00722600 C16845B7 00000001
 0D5F39F0 045D20AC 0018F07C 0073F7C5 00001000 0E3FD050 02AC0000 0E47A058
 000015CA 05669614 0018F004 00000000 0000EA01 0018F090 00001000 02AC0000
 0E3FD050 0018F090 778B3C94 778B3CC3 76149B03 00078000 00000000 02AC0000
 02AC2A88 FFFFFFFF 0DE40091 02AC2A88 0074031E FFFFFFFF FB00FA01 0000EA01
 00455600 02AC2A88 0018F847 0E3FD058 00000000 0000007F 0018F108 00D29FA0

Operating system:
 Name:     Windows
 Release:  6.1.7601 (Service Pack 1)
 Compiler: MSVC 1500

Configuration:
 Blitter:      8bpp-optimized
 Graphics set: original_windows (0)
 Language:     C:\Program Files\OpenTTD-25238M\lang\english.lng
 Music driver: win32
 Music set:    NoMusic (0)
 Network:      no
 Sound driver: win32
 Sound set:    NoSound (2)
 Video driver: win32

AI Configuration (local: 0):
  0: Human

Libraries:
 FreeType:   2.4.5
 ICU:        4.4.2
 LZMA:       5.0.3
 LZO:        2.05
 PNG:        1.5.4
 Zlib:       1.2.5

Module information:
 C:\Program Files\OpenTTD-25238M\openttd-cirdan.exe handle: 00400000 size: 9211904 crc: D1BAE5AA date: 2013-05-13 19:39:42
 C:\Windows\SysWOW64\ntdll.dll handle: 77880000 size: 1292080 crc: 00BA27E8 date: 2011-11-17 05:38:39
 C:\Windows\syswow64\kernel32.dll handle: 75360000 size: 1114112 crc: CEBA3B73 date: 2012-11-30 04:53:59
 C:\Windows\syswow64\KERNELBASE.dll handle: 76D60000 size: 274944 crc: A8107895 date: 2012-11-30 04:53:59
 C:\Windows\system32\WINMM.dll handle: 75200000 size: 194048 crc: 849223C7 date: 2010-11-20 12:21:36
 C:\Windows\syswow64\msvcrt.dll handle: 76C30000 size: 690688 crc: DAB48B3A date: 2011-12-16 07:52:58
 C:\Windows\syswow64\USER32.dll handle: 76A50000 size: 833024 crc: 9EFE504D date: 2010-11-20 12:08:57
 C:\Windows\syswow64\GDI32.dll handle: 76B50000 size: 311296 crc: 5F06BCCF date: 2010-11-20 12:08:51
 C:\Windows\syswow64\LPK.dll handle: 754D0000 size: 25600 crc: 3C6CC57C date: 2009-07-14 01:11:23
 C:\Windows\syswow64\USP10.dll handle: 759B0000 size: 626688 crc: 6C809B74 date: 2012-11-22 04:45:03
 C:\Windows\syswow64\ADVAPI32.dll handle: 76980000 size: 640512 crc: 34D5363F date: 2010-11-20 12:18:02
 C:\Windows\SysWOW64\sechost.dll handle: 77310000 size: 92160 crc: B624B29A date: 2009-07-14 01:16:13
 C:\Windows\syswow64\RPCRT4.dll handle: 758C0000 size: 663040 crc: D136A44D date: 2010-11-20 12:08:57
 C:\Windows\syswow64\SspiCli.dll handle: 752D0000 size: 96768 crc: A8682D62 date: 2012-08-24 16:53:35
 C:\Windows\syswow64\CRYPTBASE.dll handle: 752C0000 size: 36864 crc: 00308E17 date: 2009-07-14 01:15:07
 C:\Windows\syswow64\WS2_32.dll handle: 77440000 size: 206848 crc: FD00A753 date: 2010-11-20 12:21:38
 C:\Windows\syswow64\NSI.dll handle: 75500000 size: 8704 crc: 2ACE9671 date: 2009-07-14 01:16:11
 C:\Windows\syswow64\SHELL32.dll handle: 75A60000 size: 12872704 crc: 88F73E0C date: 2013-02-27 04:55:05
 C:\Windows\syswow64\SHLWAPI.dll handle: 75470000 size: 350208 crc: 23E05F73 date: 2010-11-20 12:21:19
 C:\Windows\system32\IMM32.DLL handle: 77330000 size: 119808 crc: 38DB5163 date: 2010-11-20 12:08:51
 C:\Windows\syswow64\MSCTF.dll handle: 76EA0000 size: 828928 crc: DFE09EEB date: 2009-07-14 01:15:43
 C:\Windows\SysWOW64\guard32.dll handle: 10000000 size: 301264 crc: 4A444B7D date: 2012-11-07 23:37:34
 C:\Windows\system32\VERSION.dll handle: 73A80000 size: 21504 crc: 88D9D0F1 date: 2009-07-14 01:16:17
 C:\Windows\system32\fltlib.dll handle: 73A70000 size: 14848 crc: 84888438 date: 2009-07-14 01:15:21
 C:\Windows\syswow64\ole32.dll handle: 75760000 size: 1414144 crc: 74A1E844 date: 2010-11-20 12:20:49
 C:\Windows\system32\uxtheme.dll handle: 74EC0000 size: 245760 crc: 60C5C746 date: 2009-07-14 01:11:24
 C:\Windows\system32\dwmapi.dll handle: 74E10000 size: 67072 crc: FC7CA4B8 date: 2009-07-14 01:15:13
 C:\Windows\system32\mswsock.dll handle: 73A00000 size: 232448 crc: 47C95B42 date: 2010-11-20 12:19:56
 C:\Windows\System32\wshtcpip.dll handle: 73800000 size: 9216 crc: BA963A19 date: 2009-07-14 01:16:20
 C:\Windows\system32\MMDevAPI.DLL handle: 74A30000 size: 213504 crc: 93C0AA4F date: 2010-11-20 12:19:39
 C:\Windows\system32\PROPSYS.dll handle: 72940000 size: 988160 crc: 888D0BCB date: 2010-11-20 12:20:57
 C:\Windows\syswow64\OLEAUT32.dll handle: 773B0000 size: 571904 crc: 2B85E126 date: 2011-08-27 04:26:27
 C:\Windows\system32\wdmaud.drv handle: 6A820000 size: 172032 crc: D5B9F5FA date: 2010-11-20 12:16:50
 C:\Windows\system32\ksuser.dll handle: 6A8E0000 size: 4608 crc: EBE07232 date: 2009-07-14 01:15:35
 C:\Windows\system32\AVRT.dll handle: 6AC70000 size: 14336 crc: 9818237B date: 2009-07-14 01:14:58
 C:\Windows\syswow64\SETUPAPI.dll handle: 76F70000 size: 1667584 crc: 1D0104E8 date: 2010-11-20 12:21:14
 C:\Windows\syswow64\CFGMGR32.dll handle: 76BE0000 size: 145920 crc: 377B5190 date: 2011-05-24 10:39:38
 C:\Windows\syswow64\DEVOBJ.dll handle: 76870000 size: 64512 crc: 66B02A5A date: 2011-05-24 10:40:05
 C:\Windows\system32\AUDIOSES.DLL handle: 744E0000 size: 195584 crc: 0A7E52B1 date: 2010-11-20 12:18:05
 C:\Windows\system32\msacm32.drv handle: 6A810000 size: 20992 crc: 73923147 date: 2009-07-14 01:14:08
 C:\Windows\system32\MSACM32.dll handle: 6A7F0000 size: 72192 crc: ABA25814 date: 2009-07-14 01:15:42
 C:\Windows\system32\midimap.dll handle: 6A8B0000 size: 16896 crc: C000494C date: 2009-07-14 01:15:40
 C:\Windows\syswow64\CLBCatQ.DLL handle: 76E10000 size: 522240 crc: 6C130B8A date: 2009-07-14 01:15:03
 C:\Windows\syswow64\psapi.dll handle: 77390000 size: 6144 crc: 25B988F9 date: 2009-07-14 01:16:12

---- gamelog start ----
Tick 0: new game started
     Revision text changed to r25238M, savegame version 65290, modified, _openttd_newgrf_version = 0x14006296
     New game mode: 1 landscape: 0
     Added NewGRF: GRF ID 9787F281, checksum 56260884F5E55368FCE23C1B9A58B8C0, filename: canadian town names v1.6\canames.grf (md5sum matches)
     Added NewGRF: GRF ID 9787EC81, checksum 7993F9B9605F350D47E55C6A8428D4E3, filename: canadian city buildings v1.6\cancity.grf (md5sum matches)
     Added NewGRF: GRF ID 9787E281, checksum 9CB8B847CD9D190857E5C81D061A260D, filename: Canada\CanRail.grf (md5sum matches)
     Added NewGRF: GRF ID 9787F481, checksum 24CD79F844B5301D761A5622991A0C8C, filename: Canada\CanRoads.grf (md5sum matches)
     Added NewGRF: GRF ID 9787EA81, checksum 7B141BC37982C9E1DC86C9FC733580F2, filename: canadian stations v1.6\canstn.grf (md5sum matches)
     Added NewGRF: GRF ID 9787F081, checksum 517DC59C264EF860B838480BD499CC61, filename: canadian (bk) tunnels v1.6\bktunnel.grf (md5sum matches)
     Added NewGRF: GRF ID 978FFA00, checksum D09DA1DCB6465ECA0968027ABCB69917, filename: Canada\bridges\CanBridges.grf (md5sum matches)
     Added NewGRF: GRF ID 57421000, checksum 6384646FC91E6E9DB22DFE276D980803, filename: Canada\bridges\hartlandbridge.grf (md5sum matches)
     Added NewGRF: GRF ID 57422000, checksum 64C4D3FB431E5EABC3C5B89556ABFE2F, filename: Canada\bridges\urbantransit.grf (md5sum matches)
     Added NewGRF: GRF ID 9787F681, checksum A8FE0813F93417C420811D97F14A96A8, filename: Canada\streams\NAWaterw.grf (md5sum matches)
     Added NewGRF: GRF ID 5742F3A0, checksum EA6C380F997F775AE1A61A8195FF5232, filename: Canada\streams\streamsw.grf (md5sum matches)
     Added NewGRF: GRF ID 4D666F01, checksum 1C3723AAE56C6648B61BC211EA344835, filename: INFRA\stolentreesw2.grf (md5sum matches)
     Added NewGRF: GRF ID 44440401, checksum C860AE279528E08E10360CB4BE507EBE, filename: pb_hovs.grf (md5sum matches)
     Added NewGRF: GRF ID 57425131, checksum 58C42299A8758E6CB25FF419D7D38388, filename: TTD_landscapew3.grf (md5sum matches)
     Added NewGRF: GRF ID 4A430002, checksum 634B23C8B408E57EA486E8EE7F54EBB5, filename: ISR\indstatr090.grf (md5sum matches)
---- gamelog end ----

*** End of OpenTTD Crash Report ***

Decoded stack trace:
[00] ???                  0x76D6C41F d?RaiseException + 88
[01] ???                  0x0064747D
[02] ???                  0x0071B84C
[03] ???                  0x0043BDA5
[04] ???                  0x00524A31
[05] ???                  0x0040781C
[06] ???                  0x004074FB
[07] ???                  0x004073F5
[08] ???                  0x0040727B
[09] ???                  0x004BE841
[10] ???                  0x004AE25A
[11] ???                  0x00467118
[12] ???                  0x004700FE
[13] ???                  0x004703BE
[14] ???                  0x00645ADE

*** End of additional info ***

[cirdan]

Thanks for your bug report. There was an error in a parameter when building train stations; the attached patch should fix it.

[Supercheese]

Seems to work better. Trunk keeps soldiering ahead, I don't envy the task of attempting to bump patches to the head revision when Cargodist was committed in the intervening revisions!

[wallyweb]

...the attached patch should fix it.

Thanks for the quick fix.

Seems to work better.

Thanks for the quick compile.

The Local Authorities have asked me to extend their eternal gratitude as their citizens now have excellent rail service and will vote for them again.