Chill's patchpack v14_7

[ChillCore]

Thank you Eddi.
I will have a looksie later on.

I need to post a new version anyway because, according to the build log of our french friends, there are few errors in my last version ...

Edit:
Does anyone now how I can force a complete rebuild of the source without taking a clean checkout (or reverting), patching and recompiling?
As it is now only the files that are modified and the ones influenced by a change are recompiled.

[Yexo]

"make clean" followed by "make". Or "Build->Rebuild solution" if you use MSVC.

[Eddi]

in MSVC there should be an option "rebuild whole project", and in unixoid environments you do "make clean && make"

[ChillCore]

make clean; make
That did the trick, compiling.

Thank you.

[NekoMaster]

Oh my god... I can't compile anything, I dont know how, It never works for me, and I can't get everything needed (and mingw doesn't work with Windows 7 for some reason)

[ChillCore]

You need MSYS also.
I checked the wiki page and there are specific instructions for Windows 7 so it should be possible as someone managed to do it already before you.
Don't rush, take your time setting things up and do not skip steps. Then it should work.
Also before trying to apply a patch make sure you can compile clean trunk.
Sorry I can not help you more as I am on Ubuntu ...

Also it would be better if a binary was not posted for v11_2.
I made a silly misstake in the language files and there is a unused ariable in train_cmd.cpp coming from the updated IS version ...

[NekoMaster]

You need MSYS also.
I checked the wiki page and there are specific instructions for Windows 7 so it should be possible as someone managed to do it already before you.
Don't rush, take your time setting things up and do not skip steps. Then it should work.
Also before trying to apply a patch make sure you can compile clean trunk.
Sorry I can not help you more as I am on Ubuntu ...

Also it would be better if a binary was not posted for v11_2.
I made a silly misstake in the language files and there is a unused ariable in train_cmd.cpp coming from the updated IS version ...

Like I said, I've followed the Wiki multiple times but nothing ever works for me, theres always something that's missing (dependencies or something in MSVC)

The only time that compiling opentted has worked for me is when im on ubuntu

[Cadde]

You need MSYS also.
I checked the wiki page and there are specific instructions for Windows 7 so it should be possible as someone managed to do it already before you.
Don't rush, take your time setting things up and do not skip steps. Then it should work.
Also before trying to apply a patch make sure you can compile clean trunk.
Sorry I can not help you more as I am on Ubuntu ...

Also it would be better if a binary was not posted for v11_2.
I made a silly misstake in the language files and there is a unused ariable in train_cmd.cpp coming from the updated IS version ...

Like I said, I've followed the Wiki multiple times but nothing ever works for me, theres always something that's missing (dependencies or something in MSVC)

The only time that compiling opentted has worked for me is when im on ubuntu

I've never managed to get that Mingw and MSYS combo working ever... But VS has worked twice, i would set it up a third time but then i remember just how much needs to be downloaded and set up carefully i just say "meh".
And that's why i want ChillCore to put the economy balance into his pack and someone to make me a binary. Because it's so painful to set up a compile environment I'd rather not play at all than do it.

[ChillCore]

I have replaced the patch in first post and on the previous page -> removed the unused variable and fixed the language files.


I am still looking around in the source to modify vehicle profits as per daylength_factor correctly.
For the moment I am looking at 'void CargoPayment::PayFinalDelivery' and 'Money CargoPayment::PayTransfer' in economy.cpp as those functions seem to point at the other "to_check" functions.
I have not yet changed these functions ...
What if I just multiplied days_in_transit ?

[wisefield]

Does anyone successfully compile patchpack on Mac OS X?

I tried on 10.6 with r21421 source code and latest Xcode but ./configure fail to detect liblzma. Without liblzma it cannot find lzo2 while running make bundle.
Of course I got libpng, liblzma, lzo2 and zlib via macporrts and my .bash_profile contains /usr/lib and /opt/local/lib. I tried to deactivate one of libiconv but there's only one libicov in my /usr.

anyone with simillar problem or possible solution?

[MagicBuzz]

Do you already tried to compile successfully the lastest trunk ?

Those errors looks like mostly environment problems rather than patch problems (as the patch should not change anything about the location of those included libraries)

[Cadde]

Do you already tried to compile successfully the lastest trunk ?

Those errors looks like mostly environment problems rather than patch problems (as the patch should not change anything about the location of those included libraries)

Doubt that's what he meant either, he meant to ask for help compiling on Mac in general which this thread isn't meant for anyways.
So he should search the forum and ask where appropriate.

[wisefield]

Do you already tried to compile successfully the lastest trunk ?

Those errors looks like mostly environment problems rather than patch problems (as the patch should not change anything about the location of those included libraries)

No I didn't. Will try and perhaps that can solve my problem(1.0.5 works well though). Thanks.

[MagicBuzz]

Did you follow this link ?
http://wiki.openttd.org/Coding_Tools#MacOS

It may hekp you fixing your environment.
=> Also, you may find some help/trick here http://www.tt-forums.net/viewtopic.php? ... s&start=20

[ColdIce]

i tried to compile a win32 version, but i get some errors

http://www.heypasteit.com/clip/Q9L

[MagicBuzz]

Your ICU lib is outdated.

Take a look at this news :
http://www.openttd.org/en/news/136

Here is a win32 binary :

removed : bug with subsidy

[MagicBuzz]

I got an error.

Code: Select all

*** OpenTTD Crash Report ***

Crash at: Fri Dec 10 09:37:34 2010
In game date: 1950-03-16 (1)

Crash reason:
 Exception: E1212012
 Location:  7792FBAE
 Message:   Assertion failed at line 53 of c:\in\ottd\chillcore\src\core/pool_type.hpp: index < this->first_unused

OpenTTD version:
 Version:    r21421M (2)
 NewGRF ver: 110053ad
 Bits:       32
 Endian:     little
 Dedicated:  no
 Build date: Dec 10 2010 08:45:10

Registers:
 EAX: 0012F0F0 EBX: 00000016 ECX: 00000000 EDX: 77CD5E74
 ESI: 007FF1E4 EDI: 00000000 EBP: 0012F140 ESP: 0012F0F0
 EIP: 7792FBAE EFLAGS: 00200246

 Bytes at instruction pointer:
 C9 C2 10 00 90 90 90 90 90 8B FF 55 8B EC 51 51 83 7D 10 00 56 0F 84 7F

Stack trace:
 E1212012 00000000 00000000 7792FBAE 00000000 00000028 0520045E 00000000
 00860918 007BEA28 00000010 00000000 00000000 00000000 00000000 00000000
 77CD4E60 77C9C6C2 00000000 00000016 0012F1A0 00587E61 E1212012 00000000
 00000000 00000000 0065A05E 00000016 C78AD88C 0012F1B8 00000200 00000001
 0012F18C 77E8D714 00000000 77CD4E60 00587E51 00000001 0012F160 0012ED0C
 0012F700 0065F4E0 C7E50A24 FFFFFFFE 0012F3B8 006594DA 00000016 0043A680
 0012F6B7 0012F5FC 65737341 6F697472 6166206E 64656C69 20746120 656E696C
 20333520 6320666F 6E695C3A 74746F5C 68635C64 636C6C69 5C65726F 5C637273
 65726F63 6F6F702F 79745F6C 682E6570 203A7070 65646E69 203C2078 73696874
 69663E2D 5F747372 73756E75 00006465 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00210000 052DA958 00000000 00000000 00000000 00210000 00000000
 00210000 05362780 003E0030 00006A24 002A0031 00006A25 77CD66EA 053626C8
 00000000 00210000 053626E0 05362778 0012F374 00160032 00006A26 00000000
 00000000 0012F388 053626C8 00000001 053626D8 0012F398 77CD66EA 053626E0
 73CA11C8 88781182 0012F3AC 0012F3A8 00000001 77CB8AA2 0012F3B8 77CB1C5F
 77D347E0 00385C28 0012F5F4 0044CE0F 00759C74 00000035 00789F28 00789F54
 0000002B 019AA480 0012F638 00000000 0012F638 01984E4D 00000000 77C799FA

Operating system:
 Name:     Windows
 Release:  6.0.6002 (Service Pack 2)
 Compiler: MSVC 1600

Configuration:
 Blitter:      8bpp-optimized
 Graphics set: OpenGFX (542)
 Language:     C:\Users\Sylvain\Documents\OpenTTD - chillcore\lang\french.lng
 Music driver: dmusic
 Music set:    NoMusic (0)
 Network:      no
 Sound driver: win32
 Sound set:    OpenSFX (87)
 Video driver: win32

AI Configuration (local: 0):
  0: Human

Libraries:
 FreeType:   2.4.3
 ICU:        4.4.2
 LZMA:       5.0.0
 LZO:        2.03
 PNG:        1.4.4
 Zlib:       1.2.5

Module information:
 C:\in\ottd\chillcore\objs\Win32\Release\openttd.exe handle: 00400000 size: 4216832 crc: 7E452E00 date: 2010-12-10 07:50:15
 C:\Windows\system32\ntdll.dll handle: 77C70000 size: 1202168 crc: 11EF8EE5 date: 2009-04-10 22:27:50
 C:\Windows\system32\kernel32.dll handle: 778F0000 size: 891392 crc: 1164F2B3 date: 2009-04-10 22:28:22
 C:\Windows\system32\WINMM.dll handle: 72F20000 size: 189952 crc: 3E8CBFF5 date: 2009-04-10 22:28:26
 C:\Windows\system32\msvcrt.dll handle: 77A30000 size: 679936 crc: B0E5331E date: 2009-04-10 22:28:24
 C:\Windows\system32\USER32.dll handle: 77E30000 size: 627712 crc: 80F0F3C5 date: 2009-04-10 22:28:26
 C:\Windows\system32\GDI32.dll handle: 779D0000 size: 297472 crc: 69625D80 date: 2009-04-10 22:28:20
 C:\Windows\system32\ADVAPI32.dll handle: 76410000 size: 800768 crc: D7864B03 date: 2009-04-10 22:28:18
 C:\Windows\system32\RPCRT4.dll handle: 76D10000 size: 784896 crc: 35185859 date: 2010-12-03 10:47:55
 C:\Windows\system32\ole32.dll handle: 767E0000 size: 1316864 crc: 35DF2E64 date: 2010-06-28 17:00:21
 C:\Windows\system32\OLEAUT32.dll handle: 76C80000 size: 563712 crc: 12E9F438 date: 2009-04-10 22:28:24
 C:\Windows\system32\OLEACC.dll handle: 74030000 size: 234496 crc: 82CE51D9 date: 2009-10-08 21:08:01
 C:\Windows\system32\WS2_32.dll handle: 76320000 size: 179200 crc: 5D581120 date: 2008-01-19 07:37:09
 C:\Windows\system32\NSI.dll handle: 77DA0000 size: 8192 crc: 10729B39 date: 2008-01-19 07:35:57
 C:\Windows\system32\SHELL32.dll handle: 76DE0000 size: 11584512 crc: 93B423E4 date: 2010-07-26 15:51:48
 C:\Windows\system32\SHLWAPI.dll handle: 76390000 size: 353280 crc: 681AC986 date: 2009-04-10 22:28:26
 C:\Windows\system32\IMM32.DLL handle: 763F0000 size: 114688 crc: 8D83D50A date: 2009-04-10 22:28:22
 C:\Windows\system32\MSCTF.dll handle: 76930000 size: 807424 crc: 78787E19 date: 2009-04-10 22:28:22
 C:\Windows\system32\LPK.DLL handle: 76380000 size: 23552 crc: 2E03F135 date: 2010-12-03 13:12:34
 C:\Windows\system32\USP10.dll handle: 77DB0000 size: 502272 crc: A57A818A date: 2010-04-16 16:46:48
 C:\Windows\WinSxS\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.6002.18305_none_5cb72f2a088b0ed3\comctl32.dll handle: 752A0000 size: 1686016 crc: 3AB5D2D1 date: 2010-08-31 15:43:52
 C:\Windows\system32\SHFolder.dll handle: 71970000 size: 7168 crc: 1CA14A5C date: 2006-11-02 09:46:13
 C:\Windows\system32\serwvdrv.dll handle: 72F10000 size: 18432 crc: E95FF7A8 date: 2006-11-02 09:46:12
 C:\Windows\system32\umdmxfrm.dll handle: 72F00000 size: 17408 crc: 9B36F1C6 date: 2006-11-02 09:46:13
 C:\Windows\system32\wdmaud.drv handle: 72E90000 size: 167424 crc: AE942463 date: 2009-04-10 22:27:14
 C:\Windows\system32\ksuser.dll handle: 72E80000 size: 4608 crc: 4C647881 date: 2006-11-02 09:46:05
 C:\Windows\system32\MMDevAPI.DLL handle: 75220000 size: 150528 crc: 481F98E7 date: 2009-04-10 22:28:22
 C:\Windows\system32\AVRT.dll handle: 75990000 size: 12800 crc: EB589AA0 date: 2008-01-19 07:33:47
 C:\Windows\system32\SETUPAPI.dll handle: 77AE0000 size: 1591296 crc: A225D6A1 date: 2009-04-10 22:28:26
 C:\Windows\system32\WINTRUST.dll handle: 75490000 size: 172032 crc: 0FB3BA99 date: 2010-12-02 22:09:40
 C:\Windows\system32\CRYPT32.dll handle: 75C60000 size: 978944 crc: CE0B7499 date: 2009-04-10 22:28:20
 C:\Windows\system32\MSASN1.dll handle: 75DC0000 size: 60928 crc: D62CDC5B date: 2010-12-03 09:49:53
 C:\Windows\system32\USERENV.dll handle: 761D0000 size: 108544 crc: CC1E5DD3 date: 2009-04-10 22:28:26
 C:\Windows\system32\Secur32.dll handle: 761B0000 size: 72704 crc: C962EC8E date: 2010-12-03 12:48:32
 C:\Windows\system32\imagehlp.dll handle: 76350000 size: 153088 crc: EEF49677 date: 2008-01-19 07:34:32
 C:\Windows\system32\AUDIOSES.DLL handle: 72E50000 size: 115712 crc: 9E346B3A date: 2009-04-10 22:28:20
 C:\Windows\system32\audioeng.dll handle: 72DE0000 size: 397312 crc: 17666E45 date: 2008-01-19 07:33:45
 C:\Windows\system32\PSAPI.DLL handle: 76280000 size: 12288 crc: D7B812C5 date: 2006-11-02 09:46:12
 C:\Windows\system32\msacm32.drv handle: 72DC0000 size: 21504 crc: 28704D00 date: 2009-04-10 22:27:14
 C:\Windows\system32\MSACM32.dll handle: 72D80000 size: 71680 crc: A2E8F836 date: 2008-01-19 07:34:54
 C:\Windows\system32\midimap.dll handle: 72D70000 size: 17408 crc: 9FC56E7F date: 2009-04-10 22:28:22
 C:\Windows\system32\CLBCatQ.DLL handle: 76A00000 size: 523776 crc: C2EBF5E6 date: 2008-01-19 07:33:52
 C:\Windows\system32\uxtheme.dll handle: 74070000 size: 240128 crc: 5F29223E date: 2008-01-19 07:36:47
 C:\Windows\system32\dmime.dll handle: 73CD0000 size: 178688 crc: 3063C87B date: 2008-01-19 07:34:04
 C:\Windows\system32\DSOUND.dll handle: 70C30000 size: 444416 crc: 2196E709 date: 2009-04-10 22:28:20
 C:\Windows\system32\POWRPROF.dll handle: 75640000 size: 98816 crc: F5FB120D date: 2009-04-10 22:28:24
 C:\Windows\system32\dmusic.dll handle: 74ED0000 size: 101888 crc: 9C95E7AB date: 2009-04-10 22:28:20
 C:\Windows\system32\dmsynth.dll handle: 73CB0000 size: 105472 crc: A572B2E6 date: 2009-04-10 22:28:20
 C:\Windows\system32\dmloader.dll handle: 73CA0000 size: 38400 crc: 43D1875C date: 2008-01-19 07:34:04
 C:\Windows\system32\mswsock.dll handle: 75910000 size: 223232 crc: 9C4248CA date: 2009-04-10 22:28:24
 C:\Windows\System32\wshtcpip.dll handle: 75630000 size: 9216 crc: 10C50FC1 date: 2008-01-19 07:37:11
 C:\Windows\system32\dmstyle.dll handle: 73C70000 size: 105472 crc: 3B1A1D06 date: 2006-11-02 12:34:33
 C:\Windows\system32\dmband.dll handle: 73C60000 size: 30208 crc: 1AE3457D date: 2006-11-02 12:34:33
 C:\Windows\System32\wship6.dll handle: 759D0000 size: 9216 crc: 2CDA59E0 date: 2008-01-19 07:37:11
 C:\Windows\system32\NLAapi.dll handle: 75560000 size: 48128 crc: 75FBFFE9 date: 2008-01-19 07:35:38
 C:\Windows\system32\IPHLPAPI.DLL handle: 75BC0000 size: 91648 crc: CB154186 date: 2009-04-10 22:28:22
 C:\Windows\system32\dhcpcsvc.DLL handle: 75B80000 size: 204288 crc: 6DA3137F date: 2009-04-10 22:28:20
 C:\Windows\system32\DNSAPI.dll handle: 75E00000 size: 168448 crc: A47DAF91 date: 2009-04-10 22:28:20
 C:\Windows\system32\WINNSI.DLL handle: 75B70000 size: 14848 crc: 83F00BFD date: 2008-01-19 07:36:55
 C:\Windows\system32\dhcpcsvc6.DLL handle: 75B40000 size: 130560 crc: 00C1059D date: 2009-04-10 22:28:20
 C:\Windows\system32\napinsp.dll handle: 72B70000 size: 50176 crc: F36C6F56 date: 2008-01-19 07:35:35
 C:\Windows\system32\pnrpnsp.dll handle: 726D0000 size: 62464 crc: EF01DBE4 date: 2008-01-19 07:36:07
 C:\Windows\system32\wshbth.dll handle: 72B60000 size: 34304 crc: E6006515 date: 2009-04-10 22:28:28
 C:\Windows\System32\winrnr.dll handle: 72B50000 size: 19968 crc: 525FD6C9 date: 2009-04-10 22:28:26
 C:\Windows\system32\WLDAP32.dll handle: 766A0000 size: 287744 crc: 4F6B6725 date: 2009-04-10 22:28:26
 C:\Windows\system32\rasadhlp.dll handle: 726C0000 size: 10240 crc: D5AE0AAA date: 2006-11-02 09:46:12

---- gamelog start ----
Tick 0: new game started
     Revision text changed to r21421M, savegame version 212, modified, _openttd_newgrf_version = 0x110053ad
     New game mode: 1 landscape: 0
     Added NewGRF: GRF ID 4D470801, checksum AB5909E50F9AFAC0DF4C5F66E241838A, filename: lumbermill.1.1\lumbermill.grf (md5sum matches)
     Added NewGRF: GRF ID 4F472B31, checksum A82F71D8F32D10557DE8AAD5794E58AB, filename: opengfx_trains-0.2.1\ogfx-trains.grf (md5sum matches)
     Added NewGRF: GRF ID 46727806, checksum 09E95562B1894A4D55D5532C6A889621, filename: opengfx_trees-0.2.2\opengfx+trees.grf (md5sum matches)
     Added NewGRF: GRF ID 4F472B32, checksum B42B3DD63720C1F2483B357575736087, filename: opengfx_road_vehicles-0.1.0\ogfx-rv.grf (md5sum matches)
     Added NewGRF: GRF ID 44460000, checksum 794F4247978D52C300939D120EA29176, filename: openttd_plus.0.1\ottdpp.grf (md5sum matches)
---- gamelog end ----

*** End of OpenTTD Crash Report ***

Decoded stack trace:
[00] kernel32             0x7792FBAE RaiseException + 88
[01] openttd              0x00587E61 CustomAbort + 16 (c:\in\ottd\chillcore\src\os\windows\crashlog_win.cpp:547)
[02] openttd              0x0065A05E raise + 378 (f:\dd\vctools\crt_bld\self_x86\crt\src\winsig.c:586)
[03] openttd              0x006594DA abort + 16 (f:\dd\vctools\crt_bld\self_x86\crt\src\abort.c:74)
[04] openttd              0x0043A680 error + 56 (c:\in\ottd\chillcore\src\openttd.cpp:132)
[05] openttd              0x0044CE0F FormatString + 4484 (c:\in\ottd\chillcore\src\strings.cpp:694)
[06] openttd              0x0044B416 GetStringWithArgs + 299 (c:\in\ottd\chillcore\src\strings.cpp:167)
[07] openttd              0x0044DD39 Subsidy::AwardTo + 97 (c:\in\ottd\chillcore\src\subsidy.cpp:47)
[08] openttd              0x0044E829 CheckSubsidised + 779 (c:\in\ottd\chillcore\src\subsidy.cpp:389)
[09] openttd              0x00411CCA DeliverGoods + 251 (c:\in\ottd\chillcore\src\economy.cpp:948)
[10] openttd              0x00412324 CargoPayment::PayFinalDelivery + 110 (c:\in\ottd\chillcore\src\economy.cpp:1048)
[11] openttd              0x00403294 VehicleCargoList::DeliverPacket + 99 (c:\in\ottd\chillcore\src\cargopacket.cpp:413)
[12] openttd              0x00403622 StationCargoList::TakeFrom + 444 (c:\in\ottd\chillcore\src\cargopacket.cpp:602)
[13] openttd              0x00412A7E LoadUnloadVehicle + 543 (c:\in\ottd\chillcore\src\economy.cpp:1240)
[14] openttd              0x004131A8 LoadUnloadStation + 128 (c:\in\ottd\chillcore\src\economy.cpp:1475)
[15] openttd              0x004536E2 CallVehicleTicks + 101 (c:\in\ottd\chillcore\src\vehicle.cpp:777)
[16] openttd              0x0043CD19 GameLoop + 608 (c:\in\ottd\chillcore\src\openttd.cpp:1430)
[17] openttd              0x00586A3D VideoDriver_Win32::MainLoop + 506 (c:\in\ottd\chillcore\src\video\win32_v.cpp:887)
[18] openttd              0x0043BBC9 ttd_main + 4157 (c:\in\ottd\chillcore\src\openttd.cpp:786)
[19] openttd              0x005889FF WinMain + 126 (c:\in\ottd\chillcore\src\os\windows\win32.cpp:431)
[20] openttd              0x0065B9B7 __tmainCRTStartup + 282 (f:\dd\vctools\crt_bld\self_x86\crt\src\crt0.c:275)
[21] kernel32             0x7793D0E9 BaseThreadInitThunk + 18
[22] ntdll                0x77CB19BB RtlInitializeExceptionChain + 99
[23] ntdll                0x77CB198E RtlInitializeExceptionChain + 54

*** End of additional info ***

Here is the savegame and config file.

Tell me if you need the crash.tmp also.

[MagicBuzz]

The error happends when a company get subsidied.

It looks like the problem comes with the FormatString function (unicode chars problem ?)

[Eddi]

this is likely a trunk bug. several things about strings have been reshuffled there recently, check if it might be fixed by updating. otherwise try to reproduce it in trunk

[MagicBuzz]

I'll try to reproduce it with lastest trunk

I'm trying to fix the conflicts, but I'm not sure what I'm doing about the saveload compatibility : there is a bump in the trunk, and I don't know exactely how to manage it in Chillcore's patchpack.
So I didn't change anything, but savegame compatibility should be break, so I won't post the updated patch...