Chill's patchpack v14_7

[Cadde]

Gotcha

Well done!

[ChillCore]

Gotcha

In the english.txt (and any other language file with IS traductions), change lines order like that :
...

Cool.
Thank you for investigating and fixing the error.
If it is not already, that block of strings should be marked in the language files as "# Do not change order of these strings.". (Have not yet checked)

I will update the patchpack in a bit.

[dkarn]

Hello Chill,

I have got a crash when i try to refit an airplane.
I use trunk r21421 and Chill's patchpack v11.2
No NewGrf in use.

crash.sav

(963.63 KiB) Downloaded 59 times

*** OpenTTD Crash Report ***

Crash at: Sat Dec 11 13:55:24 2010
In game date: 1960-01-02 (520)

Crash reason:
Exception: C0000005
Location: 004FE62E
Message: <none>

OpenTTD version:
Version: r21421M (2)
NewGRF ver: 110053ad
Bits: 32
Endian: little
Dedicated: no
Build date: Dec 11 2010 14:36:26

Registers:
EAX: 00000000 EBX: 0012F938 ECX: 00F8001E EDX: 0012F938
ESI: 0000001E EDI: 01FC3030 EBP: 0012F900 ESP: 0012F8B0
EIP: 004FE62E EFLAGS: 00010246

Bytes at instruction pointer:
66 89 88 D6 00 00 00 56 05 D8 00 00 00 50 E8 E4 84 F0 FF 8B 7F 0C 85 FF

Stack trace:
0012F96C 01FC3208 0012F964 00000004 00001808 00000000 0001FFFF 00000000
00000000 00000000 0000001E 000000C8 0000003C 00000190 0000001E 00862030
004FE496 0012F9B8 0068874C 00000000 0012F948 004FE7F2 02000001 00FF0000
00000000 00000001 00000000 00000001 0012FA00 00000000 01FC3208 01FC3208
00000001 00000000 00000004 00001808 00000000 0001FFFF 0012F9C4 00408014
00000001 00000094 00FF0000 00000000 00001E10 000017A0 5B093935 7E3994BE
7E3A8E0D 00220322 00000020 0082332B 02010001 00795818 00000255 00000004
00001808 00000000 0001FFFF 00000004 00001808 00000000 0001FFFF 004FE692
00000000 000000A1 0012FBD0 0068878E 00000000 0012FA14 00407BBC 0007857A
00000094 00FF0000 0CAA001F 00000000 00000000 00000000 02EA2630 00000094
00000000 00681FB0 009DC953 00000000 02EA2630 010F0898 0012F9F0 77EF6F0A
0012FB38 0012FA48 004B2DC2 0007857A 00000094 00FF0000 0CAA001F 00000000
00000000 00000001 00000007 02EA2630 010F0898 01EA2630 0012FA7C 004634FC
00000057 000000CA 00000007 00000001 000000CA 02EA2630 00000057 000000CA
00000007 00000086 010000EB 0012FAA8 0046560B 00000057 000000CA 00000001
000003F7 000000EB 00000001 0012FAD0 006CF1A6 00000000 00000001 0046582E
00000001 00000000 00000001 00000201 0012FB4C 00000000 00000000 0059042E
0012FBB4 00590020 00000000 00A94838 00000000 00000000 00000102 0012FB30
746A13D4 00040279 00000000 00000001 746A13D9 00000000 7FFDE000 00000102
00E20000 00040279 0012FB04 746A0F0F 0012FB78 746CF1A6 746A13E0 FFFFFFFF
746A13D9 7E3AB372 00000000 00000001 0012FBCC 00000000 0012FC80 0012FB78
7E398734 00220322 00000201 00000001 00EB03F7 00590020 DCBAABCD 00000000
0012FBB4 00590020 0012FBE0 7E398816 00590020 00220322 00000201 00000001
00EB03F7 0012FC88 0012FC80 00AC2538 00000014 00000001 00000000 00000000

Operating system:
Name: Windows
Release: 5.1.2600 (Service Pack 3)
Compiler: MSVC 1500

Configuration:
Blitter: 8bpp-optimized
Graphics set: OpenGFX (542)
Language: C:\ottdsrc\Trunk-r21421\bundle\lang\french.lng
Music driver: win32
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:\ottdsrc\Trunk-r21421\bundle\openttd.exe handle: 00400000 size: 4261376 crc: 96FD7B34 date: 2010-12-11 13:50:00
C:\WINDOWS\system32\ntdll.dll handle: 7C910000 size: 739840 crc: C0C23ACC date: 2009-02-09 10:53:55
C:\WINDOWS\system32\kernel32.dll handle: 7C800000 size: 1054720 crc: 1BDA556E date: 2009-03-21 14:07:58
C:\WINDOWS\system32\WINMM.dll handle: 76AE0000 size: 180736 crc: 3086C5C7 date: 2008-04-14 02:33:48
C:\WINDOWS\system32\ADVAPI32.dll handle: 77DA0000 size: 685568 crc: CC544FBF date: 2009-02-09 10:53:55
C:\WINDOWS\system32\RPCRT4.dll handle: 77E50000 size: 590848 crc: 24EAC660 date: 2010-08-16 08:44:32
C:\WINDOWS\system32\Secur32.dll handle: 77FC0000 size: 56832 crc: 80BD1434 date: 2009-06-25 08:26:32
C:\WINDOWS\system32\GDI32.dll handle: 77EF0000 size: 286720 crc: C8F25A13 date: 2008-10-23 12:36:51
C:\WINDOWS\system32\USER32.dll handle: 7E390000 size: 579584 crc: 6877A193 date: 2008-04-14 02:33:48
C:\WINDOWS\system32\WS2_32.dll handle: 719F0000 size: 82432 crc: 05371B19 date: 2008-04-14 02:33:49
C:\WINDOWS\system32\msvcrt.dll handle: 77BE0000 size: 343040 crc: 2C173E38 date: 2008-04-14 02:33:33
C:\WINDOWS\system32\WS2HELP.dll handle: 719E0000 size: 19968 crc: 913FE327 date: 2008-04-14 02:33:49
C:\WINDOWS\system32\SHELL32.dll handle: 7C9D0000 size: 8518656 crc: 24A06E8A date: 2010-07-27 06:30:01
C:\WINDOWS\system32\SHLWAPI.dll handle: 77F40000 size: 474624 crc: 76CDEF9E date: 2009-12-08 09:24:28
C:\WINDOWS\system32\IMM32.DLL handle: 76320000 size: 110080 crc: ADE108FB date: 2008-04-14 02:33:26
C:\WINDOWS\WinSxS\x86_Microsoft.Windows.Common-Controls_6595b64144ccf1df_6.0.2600.6028_x-ww_61e65202\comctl32.dll handle: 77390000 size: 1054208 crc: 5882DD47 date: 2010-08-23 16:12:39
C:\WINDOWS\system32\comctl32.dll handle: 58B50000 size: 617472 crc: B7D78064 date: 2010-08-23 16:12:44
C:\WINDOWS\system32\SHFolder.dll handle: 76720000 size: 25088 crc: E3F69657 date: 2008-04-14 02:33:41
C:\WINDOWS\system32\WINTRUST.dll handle: 76BE0000 size: 177664 crc: D635E0F7 date: 2009-12-24 07:00:38
C:\WINDOWS\system32\CRYPT32.dll handle: 779E0000 size: 606208 crc: 5358E850 date: 2008-04-14 02:33:21
C:\WINDOWS\system32\MSASN1.dll handle: 77A80000 size: 58880 crc: 5C0289E7 date: 2009-09-04 21:04:39
C:\WINDOWS\system32\IMAGEHLP.dll handle: 76C40000 size: 144384 crc: B79C410C date: 2008-04-14 02:33:26
C:\WINDOWS\system32\wdmaud.drv handle: 72C70000 size: 23552 crc: 37C3D64B date: 2008-04-14 02:34:34
C:\WINDOWS\system32\msacm32.drv handle: 72C60000 size: 20992 crc: 34944160 date: 2004-08-05 12:00:00
C:\WINDOWS\system32\MSACM32.dll handle: 77BB0000 size: 72192 crc: C2923BE1 date: 2008-04-14 02:33:30
C:\WINDOWS\system32\midimap.dll handle: 77BA0000 size: 18944 crc: 0395B0D6 date: 2008-04-14 02:33:29
C:\WINDOWS\system32\uxtheme.dll handle: 5B090000 size: 219648 crc: 5135A37E date: 2008-04-14 02:33:48
C:\WINDOWS\system32\MSCTF.dll handle: 74690000 size: 297984 crc: 0E37D08F date: 2008-04-14 02:33:30
C:\WINDOWS\system32\msctfime.ime handle: 75140000 size: 177152 crc: 69E19576 date: 2009-02-27 04:57:11
C:\WINDOWS\system32\ole32.dll handle: 774A0000 size: 1287680 crc: 62D2BEC9 date: 2010-07-16 12:06:19
C:\WINDOWS\system32\ctagent.dll handle: 10000000 size: 61440 crc: 2F8D5CFE date: 2002-11-05 10:05:30
C:\WINDOWS\system32\DSOUND.dll handle: 73E60000 size: 367616 crc: B245D2ED date: 2008-04-14 02:33:23
C:\WINDOWS\system32\VERSION.dll handle: 77BD0000 size: 18944 crc: 31D02D04 date: 2008-04-14 02:33:48
C:\WINDOWS\system32\mswsock.dll handle: 71990000 size: 247808 crc: D077BDB1 date: 2008-06-20 17:47:22
C:\WINDOWS\system32\hnetcfg.dll handle: 62E40000 size: 347136 crc: 1E38DDE0 date: 2008-04-14 02:33:26
C:\WINDOWS\System32\wshtcpip.dll handle: 719D0000 size: 19456 crc: F12C4BEC date: 2008-04-14 02:33:50
C:\WINDOWS\system32\OLEAUT32.DLL handle: 770E0000 size: 551936 crc: 3776E8B0 date: 2008-04-14 02:33:38
C:\PROGRA~1\MEDIAK~1\KBHook.dll handle: 01E90000 size: 49152 crc: 5D4DEBB4 date: 2004-03-19 15:07:00
C:\WINDOWS\system32\SETUPAPI.dll handle: 778E0000 size: 1005056 crc: B175FBB6 date: 2008-04-13 17:33:42
C:\WINDOWS\system32\HID.DLL handle: 68D50000 size: 20992 crc: DBE606AA date: 2008-04-14 02:33:26
C:\PROGRA~1\MEDIAK~1\NTKBHook.dll handle: 01F40000 size: 45056 crc: 4AA82628 date: 2004-03-19 15:11:40
C:\WINDOWS\system32\psapi.dll handle: 76BA0000 size: 23040 crc: 881F2E30 date: 2008-04-14 02:33:38

---- 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
---- gamelog end ----

*** End of OpenTTD Crash Report ***

Decoded stack trace:
[00] ??? 0x004FE62E
[01] ??? 0x004FE7F2
[02] ??? 0x00408014
[03] ??? 0x00407BBC
[04] ??? 0x004B2DC2
[05] ??? 0x004634FC
[06] ??? 0x0046560B
[07] ??? 0x0046582E

*** End of additional info ***

[ChillCore]

I can reproduce with v11_3.
Thank you for reporting dkarn.

Bug is not present in clean trunk r21439.
I will first fix the language files and bump to current trunk, then I will have a looksie if it is still there and what might be the cause of the segmentation fault.

[hthhs]

when the train is between the last and the first order of the orderlist the departureboards show cancelled instead of on time/delayed. Cancelled should only show when sent to a depot IIRC.

I think I've fixed what may have been causing this (I never witnessed it happening myself as I'm a poor tester) and have updated the departureboards thread.

The change was on line 107 of departures.cpp:

Code: Select all

-			if ((*v)->current_order.GetDepotActionType() & ODATFB_HALT) {
+			if ((*v)->current_order.IsType(OT_GOTO_DEPOT) && (*v)->current_order.GetDepotActionType() & ODATFB_HALT) {

[ChillCore]

when the train is between the last and the first order of the orderlist the departureboards show cancelled instead of on time/delayed. Cancelled should only show when sent to a depot IIRC.

I think I've fixed what may have been causing this (I never witnessed it happening myself as I'm a poor tester) and have updated the departureboards thread.

The change was on line 107 of departures.cpp:

Code: Select all

-         if ((*v)->current_order.GetDepotActionType() & ODATFB_HALT) {
+         if ((*v)->current_order.IsType(OT_GOTO_DEPOT) && (*v)->current_order.GetDepotActionType() & ODATFB_HALT) {

That change fixes the issue.
Thank you hthhs, it saves me a lot of searching and I would most likely not have been able to fix that myself in a timely manner .

While I was checking the result I had this crazy idea to change the departures gui a bit ...
Instead of displaying the arival time and the departure time underneath eachother it would perhaps be nice to display them on the same line ... @see shematic below:

Code: Select all

Currrently:
12.35 v .... other information
12.39 ^ .... same other information

proposal:
12.35 v 12.39 ^ ... other information

Of course it is just an idea and I do not know how feasable that is. The vehicle type icon is also displayed/not displayed at players choise so it should be possible to do the same for arival/departure times. (I think)
Feel free to ignore if you do not like it or if you see a problem with it that I have not thought about ...



Also, fixing the language string did not fix the crash when refitting an airplane. All other vehicle types are fine.
I will test the clean partial_refit patch first before digging in the patchpack code ... (-> most likely candidate)
I have not yet bumped to trunk ...

[Cadde]

While I was checking the result I had this crazy idea to change the departures gui a bit ...
Instead of displaying the arival time and the departure time underneath eachother it would perhaps be nice to display them on the same line ... @see shematic below:

Code: Select all

Currrently:
12.35 v .... other information
12.39 ^ .... same other information

proposal:
12.35 v 12.39 ^ ... other information

Of course it is just an idea and I do not know how feasable that is. The vehicle type icon is also displayed/not displayed at players choise so it should be possible to do the same for arival/departure times. (I think)
Feel free to ignore if you do not like it or if you see a problem with it that I have not thought about ...

Well, without having seen the result yet i can only say i like the idea and if it's a small code change in one place and feasible, make it an option like "display arrival/departure on one line per vehicle" so that you can pick what feels most natural to you.
Personally i only show arrivals mostly because it get's so messy with all the departures/arrivals in the same list. Which brings me to the other problem, if you show both... Which should you sort by?
Because there are times when i need to know the departure times in order rather than arrival times.

[ChillCore]

Well, without having seen the result yet i can only say i like the idea and if it's a small code change in one place and feasible, make it an option like "display arrival/departure on one line per vehicle" so that you can pick what feels most natural to you.

I would not make it too complicated.
Just one line but let the player choose what he sees like it is now, the option is there already. See the vehicle type icon for an example.
- If arrivals is chosen, show the arivals.
- If arrivals and departures are both chosen, show both but arrivals first as that time is always earlier.
- If none are chosen then ...

Just like it is now but the gui would be more consistent.
If you set in the advanced gui to show 20 entries but you enable both arrivals and departures then only ten vehicles are shown.
If changed to one line entry per arrival/departure then 20 vehicles are shown at all times.

Personally i only show arrivals mostly because it get's so messy with all the departures/arrivals in the same list. Which brings me to the other problem, if you show both... Which should you sort by?
Because there are times when i need to know the departure times in order rather than arrival times.

Let the player choose? It is possible without changing the info appearance of the line.
See town list or industry list for examples.

Anyway it is not my patch and I am not the one to decide ... it is just a suggestion.
Anther suggestion would be moving some options from the advanced setting to the departures gui, eg. showing the vehicle type icon or not ... but I should be posting this in the departure board thread ...




Attached is the new version to test, still savegame compatible with previous versions.

To recap what has changed from the previous version.
- Bump to trunk. (Waypoint gui might need some more adjustment to use the new code provided by trunk -> still need to check as I have kept the code as was before to test first and get a new diff against trunk for easier comparing.)
- Adjusted vehicle income according to daylength.
- Infrastructure sharing income was shown incorrectly.
- Fixed the departureboards showing canceled.
- Updated the partial_refit patch to current version. No more crashes when refitting aircraft.

Enjoy and thank you all for the many feedback and help in fixing things.

[pecX]

great changes!!!!
I cant await the newest binary, since my TortoiseSVN always produces crashes after rightclicking anything, so i cant compile at the moment...

You´re the best chilllllll

[ChillCore]

great changes!!!!
I cant await the newest binary, since my TortoiseSVN always produces crashes after rightclicking anything, so i cant compile at the moment...

You mean that it actually crashes? That should not happen.
I used to have a blank window opening when trying to apply a HG or Git patch, but the ones I post are usually for svn.

It may be that you first have to convert the line endings to the windows format as I am on linux. Notepad that comes with windows will not do but Notepad++ works fine for doing that.
And you should not forget to create dummy files for the new files ... Tortoise will not do that for you.

If you do both and it still will not work than I am afraid I can not help you and waiting for a binary is in your best bet indeed.
There is a sticky for compiling problems but you will have to be more specific if you want someone to help you there.

You´re the best chilllllll

Thank you.

[pecX]

after reinstalling tortoise, it worked, although now it´s crashing again... but i could finish the compiling work before it started to suck again.

so i could test your new version for the daylenght things. NOW it is what i was always looking for!

Year 1951 is with daylength factor 1. Year 1952 is daylenght factor 5. There is just a small difference now - and thats awesome. And this difference comes from small changes in the test vehicles.



The timetables are also working now. Thanks for it!

I´ll be playing a new game now with a big map and a very early start date hehehehe

[pecX]

one last question:

can you recommend any AI for this patchpack?

[NekoMaster]

Hey, this might be silly but is it possible to compile a Win9x binary (no one has to but it would be nice to play CPP on my dinosaur of a laptop running Win95 )

[Cadde]

after reinstalling tortoise, it worked, although now it´s crashing again... but i could finish the compiling work before it started to suck again.

so i could test your new version for the daylenght things. NOW it is what i was always looking for!

Year 1951 is with daylength factor 1. Year 1952 is daylenght factor 5. There is just a small difference now - and thats awesome. And this difference comes from small changes in the test vehicles.



The timetables are also working now. Thanks for it!

I´ll be playing a new game now with a big map and a very early start date hehehehe

What would be extra nice is if you could provide a bundle

[pecX]

What would be extra nice is if you could provide a bundle

unfortunately i never did this and don´t know what to do... I´m e real noob in things like this. It took me 4 days to understand how to compile...

[Cadde]

What would be extra nice is if you could provide a bundle

unfortunately i never did this and don´t know what to do... I´m e real noob in things like this. It took me 4 days to understand how to compile...

If you used MinGW and MSYS then you can just do the "make bundle" command.

The way i did it when i used vs2008 was to download another binary that was created as a bundle and replaced the exe.
Because "make" is a MSYS only thing.

[Alberth]

Hey, this might be silly but is it possible to compile a Win9x binary (no one has to but it would be nice to play CPP on my dinosaur of a laptop running Win95 )

Should be possible, just compile the program at your dinosaur, or install a cross-compiler

[ColdIce]

tried to compile, failed!

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

i compiled successfully a clean version, but with the patch i get those errors

[MagicBuzz]

Hello,

I get the same error.

I worked out arround by changing the lines in economy.cpp :
Line 1047 from :

Code: Select all

Money profit = (DeliverGoods(count, this->ct, this->current_station, cp->SourceStationXY(), cp->DaysInTransit(), this->owner, cp->SourceSubsidyType(), cp->SourceSubsidyID())) /_date_daylength_factor;

To :

Code: Select all

Money profit = (DeliverGoods(count, this->ct, this->current_station, cp->SourceStationXY(), cp->DaysInTransit(), this->owner, cp->SourceSubsidyType(), cp->SourceSubsidyID())) / ((int)_date_daylength_factor);

Line 1062 from :

Code: Select all

Money profit = (GetTransportedGoodsIncome(
			count,
			/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
			DistanceManhattan(cp->LoadedAtXY(), Station::Get(this->current_station)->xy),
			cp->DaysInTransit(),
			this->ct)) / _date_daylength_factor;

To :

Code: Select all

Money profit = (GetTransportedGoodsIncome(
			count,
			/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
			DistanceManhattan(cp->LoadedAtXY(), Station::Get(this->current_station)->xy),
			cp->DaysInTransit(),
			this->ct)) / (int)_date_daylength_factor;

A cleaner solution may to write the operator for int64/uint8 but I can't figure out how to do



Here is the Win32 binary (sorry, I can't compile it for Win9x).

[Cadde]

Here is the Win32 binary.

TYVM!

And for Chill too!