Infrastructure sharing 2.1.1

Forum for technical discussions regarding development. If you have a general suggestion, problem or comment, please use one of the other forums.

Moderator: OpenTTD Developers

User avatar
SwissFan91
Tycoon
Tycoon
Posts: 2395
Joined: 08 Feb 2009 18:36
Location: Alberta, Canada

Re: Infrastructure sharing 2.1.1

Post by SwissFan91 »

Bump. I'm guessing this patch hasn't been updated recently? Yes I know, I should do it myself. If anyone has privately updated it for themselves recently, I'd love to know.
Total Alpine Replacement Set: Industry, Town, Objects
Eddi
Tycoon
Tycoon
Posts: 8272
Joined: 17 Jan 2007 00:14

Re: Infrastructure sharing 2.1.1

Post by Eddi »

Chill's Patchpack contains a fairly up-to-date version of this patch.
lhovo
Engineer
Engineer
Posts: 2
Joined: 10 Aug 2011 13:44

Re: Infrastructure sharing 2.1.1

Post by lhovo »

Thanks everyone for your hard work on this!
I really enjoy playing openttd-IS with my friends as huge networks become feasible, to the extent that they get overloaded!!

I found that the last svn diff patch was a bit buggy so with a bit of effort I have managed to get it working on the latest checkout.
So far the bugs that I was experiencing have disappeared!!

So to help the next person that comes along, here is the diff file that im using.

Thanks again everyone!
Attachments
is2-22731-new.diff
(59.82 KiB) Downloaded 192 times
rsdworker
Traffic Manager
Traffic Manager
Posts: 148
Joined: 18 Mar 2009 13:58

Re: Infrastructure sharing 2.1.1

Post by rsdworker »

nice :) - that's will be good update - so what was changed in diff?
lhovo
Engineer
Engineer
Posts: 2
Joined: 10 Aug 2011 13:44

Re: Infrastructure sharing 2.1.1

Post by lhovo »

To clarify I have taken the diff from acabin (Posted: Tue Apr 26, 2011 7:16 pm) with the ttd checkout 22375.
Updated to version 22731 then started the awful task of smudging them together..

The bug that I was en-counting was an assert error (isGroundVehicle I think)
anyway this is what was fixed for me on this update..

I havent touched any of the IS code, other than making it merge cleanly with the latest checkout..

Cheers
FFWWKK
Engineer
Engineer
Posts: 1
Joined: 17 Sep 2011 10:47

Re: Infrastructure sharing 2.1.1

Post by FFWWKK »

lhovo's is2-22731.diff patch contains the following code: (it's also in acabin's patches)

Code: Select all

...
Index: src/table/settings.ini
...

...
@@ -1117,6 +1121,92 @@
 def      = true
 str      = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD
 
+ 	SDT_CONDBOOL(GameSettings, economy.mod_road_rebuild,                        77, SL_MAX_VERSION, 0, 0,  true,                    STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD,  NULL),
+
...
This is the old format used for the settings.h file.
It is possible that it won't break anything, but it is placed just below a (trunk) property block that should do exactly the same:

Code: Select all

[SDT_BOOL]
base     = GameSettings
var      = economy.mod_road_rebuild
from     = 77
def      = true
str      = STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD
Removing it gives me no compiler or execute errors.
oberhümer
Tycoon
Tycoon
Posts: 1283
Joined: 23 Oct 2009 19:35
Location: Here and there, sometime or another

Re: Infrastructure sharing 2.1.1

Post by oberhümer »

Update to r22944.
Attachments
infra_sharing.diff
(204.91 KiB) Downloaded 191 times
--- Licenses: GNU LGPL, version 2 or newer, code and graphics. CC-By-SA, graphics, alternatively. If you're using any, I'd like to hear about it --- Call them "track types" ---
--- Mostly inactive developer for: NuTracks - Central European Train Set --- Running/compiling for: Linux (x86) - Android - Windows (32/64 bit) ---

--- Need a file packer? 7-Zip --- BOINC - use your computing power to benefit science --- Block trackers, not ads --- Unix in dispersible pellets, the formula for the future. ---
szmitek
Engineer
Engineer
Posts: 6
Joined: 09 Oct 2011 12:20
Skype: kamil-szmit
Location: Chotomów, Poland
Contact:

Re: Infrastructure sharing 2.1.1

Post by szmitek »

perk11 wrote:So thanks to all. I started the IS2.1.1 server.
address: perk11.info
grfs: http://perk11.info/p.rar
Name: "Free for all, never ending, no autoclean grfs: perk11.info/p.rar"
A complete pack for windows (download and run): http://perk11.info/tmp/is2_sborka.rar
Could you update these links? I am using OpenTTD from http://bundles.openttdcoop.org/is2/IS2. ... -win64.zip and receive notification that the version is incompatible (to connect to perk11.info server).
SuperOwl
Engineer
Engineer
Posts: 16
Joined: 26 Feb 2003 20:00

Re: Infrastructure sharing 2.1.1

Post by SuperOwl »

Can anyone help me trited to install this and when i run OTTD i get a crash?

Code: Select all

*** OpenTTD Crash Report ***

Crash at: Tue Nov 15 19:25:28 2011

Crash reason:
 Exception: C0000005
 Location:  000000013F2CD580
 Message:   <none>

OpenTTD version:
 Version:    IS2.1.1 (0)
 NewGRF ver: 100048eb
 Bits:       64
 Endian:     little
 Dedicated:  no
 Build date: Dec 30 2009 20:57:27

Registers:
 RAX: 00000000FFFFFFFF RBX: 000000000016EE70 RCX: 000000000016EE70 RDX: 0000000000000000
 RSI: FFFFFFFFFFFFFFFF RDI: 0000000000000000 RBP: 0000000000000000 RSP: 000000000016EDC0
 R8:  000000000016F136 R9:  00000000000001B6 R10: 00000000C0000034 R11: 000000000000FFFF
 R12: 0000000000000001 R13: 0000000000000001 R14: 0000000000000000 R15: 000000013F280000
 RIP: 000000013F2CD580 EFLAGS: 00010297

 Bytes at instruction pointer:
 8A 02 84 C0 74 0D 88 03 48 FF C3 48 FF C2 49 3B D8 75 ED C6 03 00 49 3B

Stack trace:
 00000040 00000001 00000000 00000000 00000000 00000000 00000200 00000000
 00000007 00000000 3F299122 00000001 00000006 00000000 FFFFFFFF FFFFFFFF
 3F679D08 00000001 01F67BD0 00000000 3F679C48 00000001 00000000 00000000
 00620072 00000000 01D0CFC0 00000000 F40000F4 00000000 000003FF 00000000
 00000000 00000000 00000000 00000000 00000101 00000000 01C40000 00000000
 01D0AFC0 00000000 FFFFFFFE FFFFFFFF 01F60000 00000000 02000002 00000000
 76E25401 00000000 0000000A 00000000 00000101 00000000 76E25430 00000000
 01F60000 00000000 00000000 00000000 00000008 00000000 76D41E36 00000000
 01D0AFA0 00000000 01F60000 00000000 76E25400 00000000 00000202 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 01F60158 00000000 01F60000 00000000 76D65D24 00000000
 6578656F 63732E63 00300072 00000000 00000000 00000000 00000202 00000000
 00000000 00000000 00000000 00000000 00000000 00000001 00000101 00000000
 00000000 00000000 0000000D 00000000 01D0AFA0 00000000 01D0AFB0 00000000
 00000000 00000000 000000F4 00000000 00000000 00000000 00F40000 00020000
 00000000 00000000 08F50000 00000000 00000000 00000000 00000000 00000000
 01F60158 00000000 00000000 00000000 00000000 00000000 01D0AFA0 00000000
 00000000 00000000 01F60158 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000101 00000000 00000000 00000000 00000000 00000000
 00000101 00000000 00000000 00000000 00000000 00000000 000003FF 00000000
 000003FF 00000000 00000101 00000000 00000000 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 01D07D70 00000000 00000000 00000000
 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000

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

Configuration:
 Blitter:      8bpp-optimized
 Graphics set: OpenGFX
 Language:     english.lng
 Music driver: win32
 Music set:    NoMusic
 Sound driver: win32
 Sound set:    NoSound
 Video driver: win32

AI Configuration:

Libraries:
 FreeType:   2.3.11
 ICU:        4.2.1
 PNG:        1.2.40

Module information:
 E:\Program Files\OpenTTD\openttd.exe handle: 000000013F280000 size: 5125120 crc: 9C6AAE54 date: 2009-12-30 21:02:06
 C:\Windows\SYSTEM32\ntdll.dll handle: 0000000076D10000 size: 1731936 crc: 7AB8D690 date: 2010-11-20 13:28:37
 C:\Windows\system32\kernel32.dll handle: 0000000076BF0000 size: 1162752 crc: 4F9F79FE date: 2011-07-16 05:37:12
 C:\Windows\system32\KERNELBASE.dll handle: 000007FEFD260000 size: 421888 crc: D7A16149 date: 2011-07-16 05:37:12
 C:\Windows\system32\WINMM.dll handle: 000007FEF7D60000 size: 217600 crc: 7BC1529F date: 2009-07-14 01:41:56
 C:\Windows\system32\msvcrt.dll handle: 000007FEFED30000 size: 634880 crc: 7F3E716F date: 2009-07-14 01:41:32
 C:\Windows\system32\USER32.dll handle: 0000000076990000 size: 1008128 crc: 70FF7D7F date: 2010-11-20 13:27:27
 C:\Windows\system32\GDI32.dll handle: 000007FEFE920000 size: 403968 crc: 3D5BC405 date: 2010-11-20 13:26:25
 C:\Windows\system32\LPK.dll handle: 000007FEFE7F0000 size: 41984 crc: 350AF03B date: 2009-07-14 01:41:19
 C:\Windows\system32\USP10.dll handle: 000007FEFEDD0000 size: 800256 crc: B511F4B9 date: 2010-11-20 13:27:27
 C:\Windows\system32\WS2_32.dll handle: 000007FEFE9A0000 size: 297984 crc: 0F68689B date: 2010-11-20 13:27:29
 C:\Windows\system32\RPCRT4.dll handle: 000007FEFE9F0000 size: 1219584 crc: 5217F07C date: 2010-11-20 13:27:24
 C:\Windows\system32\NSI.dll handle: 000007FEFE990000 size: 13824 crc: 53B46F6C date: 2009-07-14 01:41:53
 C:\Windows\system32\ADVAPI32.dll handle: 000007FEFEF40000 size: 877056 crc: FA615A20 date: 2009-07-14 01:40:01
 C:\Windows\SYSTEM32\sechost.dll handle: 000007FEFEEA0000 size: 113664 crc: 978CFAE5 date: 2009-07-14 01:41:53
 C:\Windows\system32\SHELL32.dll handle: 000007FEFD650000 size: 14174208 crc: EA53E806 date: 2010-11-20 13:27:25
 C:\Windows\system32\SHLWAPI.dll handle: 000007FEFE8A0000 size: 448512 crc: 086DF743 date: 2010-11-20 13:27:25
 C:\Windows\system32\IMM32.DLL handle: 000007FEFEB20000 size: 167424 crc: 41B2805A date: 2009-07-14 01:41:09
 C:\Windows\system32\MSCTF.dll handle: 000007FEFD540000 size: 1067008 crc: 798DDDA0 date: 2009-07-14 01:41:28
 C:\Windows\system32\SHFolder.dll handle: 000007FEF1C30000 size: 10240 crc: 08A48DE3 date: 2009-07-14 01:41:54
 C:\Windows\system32\ole32.dll handle: 000007FEFE480000 size: 2086912 crc: 72F91CD0 date: 2010-11-20 13:27:23
 C:\Windows\system32\MMDevAPI.DLL handle: 000007FEFBFB0000 size: 284160 crc: CDF2EF81 date: 2009-07-14 01:41:26
 C:\Windows\system32\PROPSYS.dll handle: 000007FEFBE80000 size: 1212416 crc: B83FA3BE date: 2010-11-20 13:27:23
 C:\Windows\system32\OLEAUT32.dll handle: 000007FEFE6B0000 size: 861696 crc: 1F331414 date: 2011-08-27 05:37:49
 C:\Windows\system32\wdmaud.drv handle: 000007FEF5D20000 size: 217088 crc: 12829973 date: 2010-11-20 13:24:21
 C:\Windows\system32\ksuser.dll handle: 0000000071EE0000 size: 5120 crc: AA2071D9 date: 2009-07-14 01:41:13
 C:\Windows\system32\AVRT.dll handle: 000007FEFBE70000 size: 18432 crc: 5CE53CB7 date: 2009-07-14 01:40:05
 C:\Windows\system32\SETUPAPI.dll handle: 000007FEFEB50000 size: 1900544 crc: A364BD6A date: 2010-11-20 13:27:25
 C:\Windows\system32\CFGMGR32.dll handle: 000007FEFD2D0000 size: 207872 crc: 1984C339 date: 2010-11-20 13:25:50
 C:\Windows\system32\DEVOBJ.dll handle: 000007FEFD520000 size: 93184 crc: A7541AE2 date: 2009-07-14 01:40:28
 C:\Windows\system32\AUDIOSES.DLL handle: 000007FEF5AF0000 size: 296448 crc: 90389554 date: 2010-11-20 13:25:42
 C:\Windows\system32\msacm32.drv handle: 000007FEF5AE0000 size: 25600 crc: 2B579A05 date: 2009-07-14 01:38:50
 C:\Windows\system32\MSACM32.dll handle: 000007FEF5AC0000 size: 83456 crc: 3D67538B date: 2009-07-14 01:41:27
 C:\Windows\system32\midimap.dll handle: 000007FEF5AB0000 size: 20480 crc: CB902A13 date: 2009-07-14 01:41:23
 C:\Windows\system32\CRYPTBASE.dll handle: 000007FEFD0A0000 size: 44032 crc: F547C16E date: 2009-07-14 01:40:24
 C:\Windows\system32\CLBCatQ.DLL handle: 000007FEFE800000 size: 607744 crc: 939E35C9 date: 2009-07-14 01:40:15
 C:\Windows\system32\uxtheme.dll handle: 000007FEF8CB0000 size: 332288 crc: B0A13DF9 date: 2009-07-14 01:41:56
 C:\Windows\system32\dwmapi.dll handle: 000007FEF86A0000 size: 82432 crc: A459F360 date: 2009-07-14 01:40:34
 C:\Windows\system32\mswsock.dll handle: 000007FEFC9E0000 size: 326144 crc: 136B1525 date: 2010-11-20 13:27:10
 C:\Windows\System32\wshtcpip.dll handle: 000007FEFC3A0000 size: 13312 crc: 5D1E2C55 date: 2009-07-14 01:41:58
 C:\Windows\system32\psapi.dll handle: 0000000076ED0000 size: 9216 crc: 84B5E9BA date: 2009-07-14 01:41:53

---- gamelog start ----
---- gamelog end ----

*** End of OpenTTD Crash Report ***
dbkblk
Traffic Manager
Traffic Manager
Posts: 154
Joined: 29 Mar 2008 18:38

Re: Infrastructure sharing 2.1.1

Post by dbkblk »

Hi !

These feature is out since 3 years now. This seems very stable. Is there any plan to merge it into trunk ?

I mean, as i understand the cargodist approches aren't "ultimate", this patch is however well implemented. Isn't it ?
oberhümer
Tycoon
Tycoon
Posts: 1283
Joined: 23 Oct 2009 19:35
Location: Here and there, sometime or another

Re: Infrastructure sharing 2.1.1

Post by oberhümer »

Right under an unaddressed crash report is really the perfect place for that...
--- Licenses: GNU LGPL, version 2 or newer, code and graphics. CC-By-SA, graphics, alternatively. If you're using any, I'd like to hear about it --- Call them "track types" ---
--- Mostly inactive developer for: NuTracks - Central European Train Set --- Running/compiling for: Linux (x86) - Android - Windows (32/64 bit) ---

--- Need a file packer? 7-Zip --- BOINC - use your computing power to benefit science --- Block trackers, not ads --- Unix in dispersible pellets, the formula for the future. ---
Hirundo
Transport Coordinator
Transport Coordinator
Posts: 298
Joined: 27 Jan 2008 13:02

Re: Infrastructure sharing 2.1.1

Post by Hirundo »

dbkblk wrote:... this patch is however well implemented. Isn't it ?
FWIW, I'd easily put my money on being able to crash openttd with this patch applied. If it compiles, that is, since latest patch file seems to miss the new infrastructure_xxx files and instead includes a lot of unnecessary unix->windows EOL conversions.


There's a reason I stopped working on this patch long ago; there are holes open to abuse that may not surface in a coop-like environment, but they make the patch unsuitable for the general public (i.e. trunk). At that time, no-one could think of a way to plug these holes in a sane (both from user and code perspective) way and AFAIK this hasn't changed since.
Create your own NewGRF? Check out this tutorial!
dbkblk
Traffic Manager
Traffic Manager
Posts: 154
Joined: 29 Mar 2008 18:38

Re: Infrastructure sharing 2.1.1

Post by dbkblk »

OK. I didn't see things that way.
I use it trough ChillPatchPack since a long time now and haven't discovered a crash or bug, but i'm not a dev.

Thanks for your answer.

Oberhumer > I thought it was a patching problem :D
dadymax
Engineer
Engineer
Posts: 37
Joined: 03 Apr 2012 12:34
Location: Russia, Moscow
Contact:

Re: Infrastructure sharing 2.1.1

Post by dadymax »

Hi there! This patch is awesome when try to play with friends with very high rates on constructing and terraforming.
It is very funny to me that after a year of game time our railroad structure is a mix of my track and tracks of my friends :)
For me it is true coop play (with costs set to 0).

Because of this IMHO I'll try to bring last revision of this patch to last trunk. If luck be with me then patch be right here :)
User avatar
planetmaker
OpenTTD Developer
OpenTTD Developer
Posts: 9432
Joined: 07 Nov 2007 22:44
Location: Sol d

Re: Infrastructure sharing 2.1.1

Post by planetmaker »

You find the (original) repository here: http://dev.openttdcoop.org/projects/is2
dadymax
Engineer
Engineer
Posts: 37
Joined: 03 Apr 2012 12:34
Location: Russia, Moscow
Contact:

Re: Infrastructure sharing 2.1.1

Post by dadymax »

Yes, I was seen this rep and already downloaded some files. I read this forum and over it for a month or two and because of that I understood common things :)
But thanks anyway :) And thanks that you continue develop things on main oTTD stream. :bow:
IS patch is stand in deadlock for a more than halfyear and just ChillCore try to keep this patch on afloat. However ChillCore maintain it's own patchpack ( Respect to him! ) and to anyone who may want to try just IS is a trouble that IS work on very old trunk. Perhaps in near future I cat maintain own patchset.... :roll:
ZxBiohazardZx
Tycoon
Tycoon
Posts: 1534
Joined: 14 Mar 2006 12:46
Location: Netherlands

Re: Infrastructure sharing 2.1.1

Post by ZxBiohazardZx »

since IS has been pretty stable on the chrillcore patchpack, is there any other requirement to add the feature in the trunk ?
User avatar
ChillCore
Tycoon
Tycoon
Posts: 2822
Joined: 04 Oct 2008 23:05
Location: Lost in spaces

Re: Infrastructure sharing 2.1.1

Post by ChillCore »

Note that not crashing does not mean feature complete and/or stable.
One of the major issues to fix is handling the correct payment when cargo is transfered between companies.

As it is now the company that makes the final delivery receives all of the final payment, minus previous transfer payments IIRC, instead of taking into account that the previous companies might have been overpayed (or not have been payed enough) for their leg of the route.

A way to solve this would be to remember where cargo packets have been and by who they were transported but with the sheer amount of packets this will cause a massive overhead and will most likely slow down the game considerably.
^^^ Imagine a cargo packet being transfered between ten companies, at different speeds and over different distances, from one side of a (large) map to the other side. Also a packet can be transported more than once by the same company.

In trunk this is not a problem as the transfer payments (eg. A -> B, B -> C, C ->D) are calculated by paying a percentage (as defined in the advandced settings) of what normally would be payed for transporting cargo from one station to the other while the final payment is just the payment from A to D minus the total amount of what has been payed before (the total amount is the only thing being stored for the moment).
Even if some of the vehicles in the chain are losing money, in the end all the money is going to the same company anyway.
EDIT:The same problem exists in trunk too when transfering cargo via oil rigs as explained by Yexo on the next page.

I hope the above is not too confusing. I tried to keep it simple. ;)


Anyway, dadymax, good luck updating the patch.
My patchpack is still a 1000+ revisions behind trunk and I know that I still have quite a few conflicts to solve while bumping.
Also, thank you for the kind words. ;)
Last edited by ChillCore on 12 Apr 2012 22:39, edited 1 time in total.
-- .- -.-- / - .... . / ..-. --- .-. -.-. . / -... . / .-- .. - .... / -.-- --- ..- .-.-.-
--- .... / -.-- . .- .... --..-- / .- -. -.. / .--. .-. .- .. ... . / - .... . / .-.. --- .-. -.. / ..-. --- .-. / .... . / --. .- ...- . / ..- ... / -.-. .... --- --- -.-. .... --- --- ... .-.-.- / ---... .--.

Playing with my patchpack? Ask questions on usage and report bugs in the correct thread first, please.
All included patches have been modified and are no longer 100% original.
User avatar
supermop
Tycoon
Tycoon
Posts: 1104
Joined: 21 Feb 2010 00:15
Location: Fitzroy North - 96

Re: Infrastructure sharing 2.1.1

Post by supermop »

In terms of trunk goals, wouldn't it be better to look at infrastructure sharing as separate from 'revenue sharing'. The feature of driving trains on another company's tracks is distinct enough from that of cargo splitting journeys between companies. It will still be awhile before any destination feature is in trunk, and also that a patch shouldn't be written for trunk dependent of the presupposition of inclusion of a currently unimplemented feature. Without a destination patch, transfers occur only as result of direct action of the player, and much less frequently. Therefore, a hypothetical trunk version similar to current but with IS would only see transfers between players that lead to problematic payments due to intentional collaboration between several players. As in these cases all parties would be acting in concert, it could be open to interpretation whether the payment model was 'broken' or not.

While it would be certainly nice to have a patch for a better control over revenue sharing, that is ultimately separate from the core functionality of allowing vehicles to use separately owned infrastructure.

Best,
User avatar
Zuu
OpenTTD Developer
OpenTTD Developer
Posts: 4553
Joined: 09 Jun 2003 18:21
Location: /home/sweden

Re: Infrastructure sharing 2.1.1

Post by Zuu »

So your proposal is to not allow sharing of stations - only tracks? Sounds like a reasonable limitation in order to break of part of the feature that could perhaps qualify for trunk faster than getting everything completed.
My OpenTTD contributions (AIs, Game Scripts, patches, OpenTTD Auto Updater, and some sprites)
Junctioneer (a traffic intersection simulator)
Post Reply

Return to “OpenTTD Development”

Who is online

Users browsing this forum: No registered users and 17 guests