The International Simutrans Forum

 

Author Topic: Incorporating changes from Standard  (Read 5161 times)

0 Members and 1 Guest are viewing this topic.

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19273
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #70 on: February 01, 2020, 10:59:34 AM »
Vladki - thank you: that is helpful. Note that it is not necessary to use an actual client and server for desync testing: connecting to a server running on the same machine is usually sufficient. Also, only a cross compile build on Windows will stay in sync with a Linux server: a Visual Studio build will not.

As to which parts of the code have caused loss of synchronisation problems, this is not confined to one area of the code, but can arise anywhere that client and server could in any way diverge affecting the simulation itself.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #71 on: February 01, 2020, 11:45:50 AM »
Using it on real game will bring more testers

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19273
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #72 on: February 01, 2020, 12:09:42 PM »
Using it on real game will bring more testers

This is true - and one thing that does also need to be tested is whether it compiles with the command line server build, as there is a problem with that in the current nightly builds.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #73 on: February 01, 2020, 12:20:59 PM »
until 120.1.3 (and slice view improvement) --> https://github.com/Phystam/simutrans-extended/tree/merge-from-standard120-1-3-fix based on extended version 14.7.
I tried to compile this branch on Linux and failed

In file included from bauer/brueckenbauer.cc:30:0:
bauer/../descriptor/building_desc.h: In member function ‘bool building_desc_t::is_transport_building() const’:
bauer/../descriptor/building_desc.h:300:117: error: ‘decoration_stop’ cannot be used as a function
  bool is_transport_building() const { return (type > headquarters  && type <= flat_dock) || is_type(decoration_stop(); }
                                                                                                                     ^

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #74 on: February 01, 2020, 12:42:56 PM »
I have fixed the above bug - in the last line should be
Code: [Select]
is_type(decoration_stop); And compiled both client and server: http://list.extended.simutrans.org/phystam-binaries/
But it cannot load the new pakset - same error as mentioned here: https://forum.simutrans.com/index.php/topic,19430.msg184393.html#msg184393

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #75 on: February 01, 2020, 12:45:27 PM »
Yes, decoration_stop is my another developing branch...
And, you should start the server with OLD pakset. NEW pakset has Ranran's newly introduced features, so there is no compatibility.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #76 on: February 01, 2020, 12:52:02 PM »
OK, I noticed that I was compiling your master branch instead of merge-from-standard120-1-3-fix
Regarding the pakset - which is the latest commit that I can use? The nightly is not usable, so I need to compile myself.

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #77 on: February 01, 2020, 12:57:39 PM »
Which platform do you use? I can compile makeobj for only linux and the executable for linux/Windows both. If it works, I can provide it to you.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #78 on: February 01, 2020, 01:01:02 PM »
Linux 64-bit. If it is only about recompiling the pakset with the right makeobj, then it is no problem. I'll just need a windows client for other players to join.

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #79 on: February 01, 2020, 01:04:42 PM »
You can download from Here.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #80 on: February 01, 2020, 01:07:54 PM »
I have compiled my own makeobj from your sources. I just need to know if I just have to compile the latest pakset sources with your makeobj, or do I need to use some older version of the pakset?

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #81 on: February 01, 2020, 01:11:21 PM »
I did not touch any descriptor/writer codes, so you can use the old version directly (probably).

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #82 on: February 01, 2020, 01:13:56 PM »
old version of what ? pakset or makeobj? I'm asking about which pakset version is compatible with your simutrans version

Offline Freahk

  • *
  • Posts: 577
  • Languages: DE, EN
Re: Incorporating changes from Standard
« Reply #83 on: February 01, 2020, 01:15:38 PM »
If I understand this correctly, any pakset sources compiled with the given makeobj should be compatible to that version of simutrans as dat files did not change.

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #84 on: February 01, 2020, 01:17:50 PM »
The pakset compiled with Makeobj version 60.01 for simutrans 120.2.1 Extended Nightly development build 14.7 or lower.

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19273
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #85 on: February 01, 2020, 02:57:46 PM »
Linux 64-bit. If it is only about recompiling the pakset with the right makeobj, then it is no problem. I'll just need a windows client for other players to join.

I should note that you will need a cross-compiled Windows client (or, at leas, one built with MinGW or similar), or clients will not be able to stay in sync.

Offline Vladki cz

  • Devotee
  • *
  • Posts: 2906
    • My addons, mostly roadsigns, pak128.cs
  • Languages: EN, CS
Re: Incorporating changes from Standard
« Reply #86 on: February 01, 2020, 04:38:04 PM »
Can you provide such build?

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #87 on: February 01, 2020, 05:04:36 PM »
For Windows 64bit (mingw build): here ^^

Offline prissi

  • Developer
  • Administrator
  • *
  • Posts: 9709
  • Languages: De,EN,JP
Re: Incorporating changes from Standard
« Reply #88 on: February 02, 2020, 12:46:36 PM »
If there is a sync issue between MSVC and Mingw compilation, I highly suggest looking for the use of long as sint64 (because it remans and sint32 in MSVC).

Offline Phystam jp

  • *
  • Posts: 380
  • Pak256.Ex developer
    • Pak256 wiki page
  • Languages: JP, EN, EO
Re: Incorporating changes from Standard
« Reply #89 on: February 05, 2020, 08:44:03 AM »
Now I am trying to incorporate the following patch:
https://forum.simutrans.com/index.php/topic,16536.0.html
This patch moves the system colors to 16bit.
Almost all parts including the changes in Extended are replaced, but in some reason, simutrans cannot load the system colors from simuconf.tab, such as cursor color, window title bar color, etc.
I temporary pushed the current progress of the work to https://github.com/phystam/simutrans-extended/tree/merge-from-standard120-2-2

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Moderator
  • *
  • Posts: 19273
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Incorporating changes from Standard
« Reply #90 on: February 08, 2020, 08:24:54 PM »
Phystam - I should be grateful if you could check compatibility with this work and the master branch after the incorporation of the private car routing feature into the master branch.