The International Simutrans Forum

 

Author Topic: Slopes in tunnels  (Read 34268 times)

0 Members and 1 Guest are viewing this topic.

Offline gerw

  • Coder/patcher
  • *
  • Posts: 618
Slopes in tunnels
« on: February 05, 2009, 07:00:57 PM »
Without dwachs' effort to the underground view, this would be useless, since it would be hard to get an overview about the tunnels...

Also a version which includes dwachs' underground view patch is appended (some posts below), could you make executables, wernieman?

[ You have to append something like
Code: [Select]
toolbar[8][15]=general_tool[33],7
toolbar[8][16]=general_tool[34],7
to your menuconf.tab ]
« Last Edit: February 06, 2009, 10:13:28 AM by gerw »

Offline DirrrtyDirk

  • Devotees (Inactive)
  • *
  • Posts: 1253
  • JR 700 Series Shinkansen
  • Languages: EN,DE
Re: A dream becomes true: Slopes in tunnels!
« Reply #1 on: February 05, 2009, 07:08:09 PM »
I... I can't believe my eyes! Is it true? Or am I dreaming?

Offline wernieman

  • Devotees (Inactive)
  • *
  • Posts: 713
    • Werniemans-Webside (only German)
Re: A dream becomes true: Slopes in tunnels!
« Reply #2 on: February 05, 2009, 07:43:36 PM »
I work on it ....
« Last Edit: February 05, 2009, 07:49:18 PM by wernieman »

Offline IgorEliezer br

  • Devotee
  • Administrator
  • *
  • Posts: 4083
  • Cake recipes are cool... REALLY!
    • Igor Eliezer Architect and Urban Planner/Arquiteto e Urbanista
  • Languages: PT, EN, AutoLISP, Python
Re: A dream becomes true: Slopes in tunnels!
« Reply #3 on: February 05, 2009, 08:02:54 PM »
Admin note:

"A dream becomes true!" is not an useful topic... as punishment, I wil... I will... bah! Forget it! The topic title represents very well the moment as I'm seeing. ;)

I... I can't believe my eyes! Is it true? Or am I dreaming?

*facepalm*

You are not.  ;D

Offline ij

  • *
  • Posts: 41
Re: A dream becomes true: Slopes in tunnels!
« Reply #4 on: February 05, 2009, 08:14:43 PM »
I think both patches are broken, slopes patch does not apply on top of latest dwachs underground mode patch I know of, and the underground+slopes patch is missing the new ceiling files (though one can get them from the slopes only patch with little effort :-)).

It certainly works though (at least for a single slope :-)).

Offline Dwachs

  • DevTeam, Coder/patcher
  • Administrator
  • *
  • Posts: 4568
  • Languages: EN, DE, AT
Re: A dream becomes true: Slopes in tunnels!
« Reply #5 on: February 05, 2009, 08:34:23 PM »
I think both patches are broken, slopes patch does not apply on top of latest dwachs underground mode patch I know of, and the underground+slopes patch is missing the new ceiling files (though one can get them from the slopes only patch with little effort :-)).

I think the first patch is against a clean simutrans, the second one against simutrans with the new-underground-mode-patch applied. So at least one of the patch files is not broken ;)

@gerw: Nice work!  :)  Saves me programming time ;)

Offline wernieman

  • Devotees (Inactive)
  • *
  • Posts: 713
    • Werniemans-Webside (only German)
Re: A dream becomes true: Slopes in tunnels!
« Reply #6 on: February 05, 2009, 08:38:07 PM »
Shid .. I don't get it to work!
Code: [Select]
simutrans@birgit ~/comp2 $ ./compilieren.sh
patching file simwerkz.cc
patching file simwerkz.h
patching file simmenu.h
patching file Makefile
patching file boden/tunnel_ceiling.cc
patching file boden/tunnel_ceiling.h
patching file boden/tunnelboden.cc
patching file boden/tunnelboden.h
patching file boden/grund.h
patching file simplan.cc
patching file bauer/wegbauer.cc
patching file bauer/tunnelbauer.cc
patching file bauer/tunnelbauer.h
patching file simmenu.cc
patching file simwerkz.cc
Hunk #2 FAILED at 357.
Hunk #20 FAILED at 1668.
Hunk #21 FAILED at 1693.
Hunk #22 succeeded at 1765 (offset 15 lines).
Hunk #23 succeeded at 1969 (offset 15 lines).
Hunk #24 FAILED at 1989.
Hunk #25 succeeded at 2333 (offset 16 lines).
Hunk #26 succeeded at 2345 (offset 16 lines).
Hunk #27 succeeded at 2511 (offset 16 lines).
Hunk #28 succeeded at 2566 (offset 16 lines).
Hunk #29 succeeded at 2635 (offset 16 lines).
Hunk #30 succeeded at 2730 (offset 16 lines).
Hunk #31 succeeded at 2782 (offset 16 lines).
Hunk #32 succeeded at 2829 (offset 16 lines).
Hunk #33 succeeded at 2845 (offset 16 lines).
Hunk #34 succeeded at 2887 (offset 16 lines).
Hunk #35 succeeded at 2969 (offset 16 lines).
Hunk #36 succeeded at 3066 (offset 16 lines).
Hunk #37 succeeded at 3139 (offset 16 lines).
Hunk #38 succeeded at 3298 (offset 16 lines).
Hunk #39 succeeded at 3351 (offset 16 lines).
Hunk #40 succeeded at 3385 (offset 16 lines).
Hunk #41 succeeded at 3418 (offset 16 lines).
Hunk #42 succeeded at 3467 (offset 16 lines).
Hunk #43 succeeded at 3507 (offset 16 lines).
Hunk #44 succeeded at 3546 (offset 16 lines).
Hunk #45 succeeded at 3682 (offset 16 lines).
Hunk #46 succeeded at 3753 (offset 16 lines).
4 out of 46 hunks FAILED -- saving rejects to file simwerkz.cc.rej
patching file simwerkz.h
Hunk #9 succeeded at 223 with fuzz 2 (offset 11 lines).
Hunk #10 succeeded at 282 (offset 11 lines).
Hunk #11 succeeded at 300 (offset 11 lines).
Hunk #12 succeeded at 316 (offset 11 lines).
Hunk #13 succeeded at 341 (offset 11 lines).
Hunk #14 succeeded at 385 (offset 11 lines).
Hunk #15 succeeded at 454 (offset 11 lines).
Hunk #16 succeeded at 582 (offset 11 lines).
Hunk #17 succeeded at 631 (offset 11 lines).
Hunk #18 succeeded at 689 (offset 11 lines).
Hunk #19 succeeded at 853 (offset 11 lines).
Hunk #20 succeeded at 864 (offset 11 lines).
Hunk #21 succeeded at 875 (offset 11 lines).
Hunk #22 succeeded at 886 (offset 11 lines).
Hunk #23 FAILED at 913.
1 out of 23 hunks FAILED -- saving rejects to file simwerkz.h.rej
patching file simmenu.h
Reversed (or previously applied) patch detected!  Skipping patch.
3 out of 3 hunks ignored -- saving rejects to file simmenu.h.rej
patching file Makefile
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file Makefile.rej
patching file vehicle/simpeople.cc
patching file vehicle/simverkehr.cc
patching file vehicle/simvehikel.cc
patching file gui/colors.cc
patching file gui/components/gui_world_view_t.cc
patching file gui/colors.h
patching file gui/fahrplan_gui.cc
patching file simworld.cc
patching file boden/wege/weg.cc
patching file boden/brueckenboden.cc
patching file boden/tunnelboden.cc
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file boden/tunnelboden.cc.rej
patching file boden/tunnelboden.h
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file boden/tunnelboden.h.rej
patching file boden/grund.cc
patching file boden/grund.h
Hunk #3 FAILED at 207.
1 out of 6 hunks FAILED -- saving rejects to file boden/grund.h.rej
patching file boden/fundament.cc
patching file boden/boden.cc
patching file boden/monorailboden.cc
patching file simplan.cc
Reversed (or previously applied) patch detected!  Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file simplan.cc.rej
patching file bauer/wegbauer.cc
Reversed (or previously applied) patch detected!  Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file bauer/wegbauer.cc.rej
patching file bauer/tunnelbauer.cc
Reversed (or previously applied) patch detected!  Skipping patch.
9 out of 9 hunks ignored -- saving rejects to file bauer/tunnelbauer.cc.rej
patching file bauer/tunnelbauer.h
Reversed (or previously applied) patch detected!  Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file bauer/tunnelbauer.h.rej
patching file simmenu.cc
Reversed (or previously applied) patch detected!  Skipping patch.
5 out of 5 hunks ignored -- saving rejects to file simmenu.cc.rej
patching file simview.cc

Offline isidoro

  • Devotee
  • *
  • Posts: 1129
Re: A dream becomes true: Slopes in tunnels!
« Reply #7 on: February 05, 2009, 09:25:10 PM »
I... I can't believe my eyes! Is it true? Or am I dreaming?

I can't believe it either.  It's a mirage for sure...  ;)

Offline VS

  • Senior Plumber (Devotee)
  • Devotee
  • *
  • Posts: 4855
  • Vladimír Slávik
    • VS's Simutrans site
  • Languages: CS,EN
Re: A dream becomes true: Slopes in tunnels!
« Reply #8 on: February 05, 2009, 09:34:52 PM »
Mirage or miracle? ;) At last we will get a "full version" of underground mode!

Offline gerw

  • Coder/patcher
  • *
  • Posts: 618
Re: A dream becomes true: Slopes in tunnels!
« Reply #9 on: February 05, 2009, 11:44:00 PM »
Yesterday, I had not much time, so it was a post with nearly zero information ;) Yes, the first patch-file is only my patch (against 2295) and the second is my patch + dwachs' patch (against 2295), but tunnel_ceiling.* is missing (**** svn add ... happens as often as forgetting mail attachment). I appended a new file.

@ijs: It should also work with many slopes. Even underwater tunnels are possible...

@Igor: Of course, we can rename it.

Offline vilvoh

  • One of the good guys
  • Administrator (Inactive)
  • *
  • Posts: 4504
  • I'm the constructor, the architect
    • Escala real
Re: A dream becomes true: Slopes in tunnels!
« Reply #10 on: February 05, 2009, 11:55:46 PM »
simply...

Offline ansgar

  • *
  • Posts: 80
Re: A dream becomes true: Slopes in tunnels!
« Reply #11 on: February 06, 2009, 12:49:14 AM »
This looks quite cool. :-)

Offline isidoro

  • Devotee
  • *
  • Posts: 1129
Re: A dream becomes true: Slopes in tunnels!
« Reply #12 on: February 06, 2009, 02:18:01 AM »
Mirage or miracle? ;) At last we will get a "full version" of underground mode!

I intended mirage, but accept miracle as well.  :)

Offline wernieman

  • Devotees (Inactive)
  • *
  • Posts: 713
    • Werniemans-Webside (only German)
Re: A dream becomes true: Slopes in tunnels!
« Reply #13 on: February 06, 2009, 08:37:22 AM »
So at the moment, I only need the last patch for the compiling?

Offline The Hood

  • Devotee
  • *
  • Posts: 2889
  • pak128.Britain developer
Re: A dream becomes true: Slopes in tunnels!
« Reply #14 on: February 06, 2009, 09:01:28 AM »
Wow.  First rivers and now slopes in tunnels.  In less than 2 weeks!  I will have to start dreaming up more dreams to have included in simutrans soon!

Offline gerw

  • Coder/patcher
  • *
  • Posts: 618
Re: Slopes in tunnels
« Reply #15 on: February 06, 2009, 09:20:04 AM »
So at the moment, I only need the last patch for the compiling?
Yes. Just get a clean r2295 and then apply underground-2295_slopes.patch.

Edit:
With r2300 you will get
Code: [Select]
2 out of 46 hunks FAILED -- saving rejects to file simwerkz.cc.rejbut it doesn't matter, since these two hunks was included in r2298. So you can just compile it with r2300 and ignore the failed hunks.
« Last Edit: February 06, 2009, 10:15:05 AM by gerw »

Offline z9999

  • Devotees (Inactive)
  • *
  • Posts: 848
Re: Slopes in tunnels
« Reply #16 on: February 06, 2009, 12:08:19 PM »
Some problems.
- Ways under sea level can't slope up or slope down anymore.
- With under ground patch, two orange zeigers shows on slope, and one of them never disappear.

Offline wernieman

  • Devotees (Inactive)
  • *
  • Posts: 713
    • Werniemans-Webside (only German)
Re: Slopes in tunnels
« Reply #17 on: February 06, 2009, 12:58:37 PM »
I compiled it, see http://patches.simutrans-germany.com/

The Name is 2295, but the Simutranscode Revision is 2300

And it is only the Programm, no dll (see nightly-page) or Translation/PAK ...

Offline gerw

  • Coder/patcher
  • *
  • Posts: 618
Re: Slopes in tunnels
« Reply #18 on: February 06, 2009, 12:59:26 PM »
- Ways under sea level can't slope up or slope down anymore.
This is because the build_tunnel_slope only works with real 3d coordinates, but you can't select tiles underwater. I think, this is changeable with the new undergroundview.

Quote
- With under ground patch, two orange zeigers shows on slope, and one of them never disappear.
I can't reproduce this. Can you describe, what you have done? Edit: Now I've got it. I will have a look for it, when the underground view is included in trunk.

@wernieman: Thank you!

Offline jamespetts gb

  • Simutrans-Extended project coordinator
  • Devotee
  • *
  • Posts: 18591
  • Cake baker
    • Bridgewater-Brunel
  • Languages: EN
Re: Slopes in tunnels
« Reply #19 on: February 06, 2009, 03:26:16 PM »
I am very impressed - this is an extremely useful feature!

Offline VS

  • Senior Plumber (Devotee)
  • Devotee
  • *
  • Posts: 4855
  • Vladimír Slávik
    • VS's Simutrans site
  • Languages: CS,EN
Re: Slopes in tunnels
« Reply #20 on: February 06, 2009, 03:31:54 PM »
I'm really looking forward to this, too. Erotunnel in 1830, mwahahahaha! Napoleon will steamroll (on a steam train, after all ;) ) all the way to Edinburgh.

Offline DirrrtyDirk

  • Devotees (Inactive)
  • *
  • Posts: 1253
  • JR 700 Series Shinkansen
  • Languages: EN,DE
Re: Slopes in tunnels
« Reply #21 on: February 06, 2009, 03:51:42 PM »
Excellent work!

Hope this will make into the trunk among the new underground view soon.

Offline z9999

  • Devotees (Inactive)
  • *
  • Posts: 848
Re: Slopes in tunnels
« Reply #22 on: February 06, 2009, 04:20:51 PM »
Another problem.
I can make a slope down on the tile which have stop.
And stop name changed "undef".
( I didn't test this stop is valid or not.)

It need to check stop, depot, etc, and forbid it.
« Last Edit: February 06, 2009, 04:29:46 PM by z9999 »

Offline ij

  • *
  • Posts: 41
Re: Slopes in tunnels
« Reply #23 on: February 06, 2009, 08:35:02 PM »
@gerw: I wasn't reporting a bug with that "one slope" statement, just saying that I got it to build and work nevertheless, I didn't try more than a slope at that time, thus "one slope"...

...But here's a real issue, one can go into Simu-trans-dimensional with a simple enough trick :-D

Offline gauthier

  • Devotee
  • *
  • Posts: 3629
    • SNFOS'website (in both FR and EN)
  • Languages: FR, EN, JP
Re: Slopes in tunnels
« Reply #24 on: February 06, 2009, 09:09:30 PM »
simply ... MAGNIFICAL ! Surely one of the better progress with rivers !

EDIT : just one thing ... How I must make these slopes ???
« Last Edit: February 06, 2009, 09:18:58 PM by gauthier »

Offline DirrrtyDirk

  • Devotees (Inactive)
  • *
  • Posts: 1253
  • JR 700 Series Shinkansen
  • Languages: EN,DE
Re: Slopes in tunnels
« Reply #25 on: February 06, 2009, 09:49:41 PM »
gauthier, you need the special .exe file and you need to add the two lines to your simuconf.tab (which will not work with a normal simutrans nightly! prepare to remove them again).

Offline gauthier

  • Devotee
  • *
  • Posts: 3629
    • SNFOS'website (in both FR and EN)
  • Languages: FR, EN, JP
Re: Slopes in tunnels
« Reply #26 on: February 06, 2009, 10:13:48 PM »
I have downloaded the special exe (which has just crashed after creation of four cities connected by a High speed line which has bothered me to connect the central city's station ...)

but what are the lines to add to simuconf ?

Offline DirrrtyDirk

  • Devotees (Inactive)
  • *
  • Posts: 1253
  • JR 700 Series Shinkansen
  • Languages: EN,DE
Re: Slopes in tunnels
« Reply #27 on: February 06, 2009, 10:15:47 PM »
In the very first post in this thread it says:  ;)

[ You have to append something like
Code: [Select]
toolbar[8][15]=general_tool[33],7
toolbar[8][16]=general_tool[34],7
to your menuconf.tab ]

Offline gerw

  • Coder/patcher
  • *
  • Posts: 618
Re: Slopes in tunnels
« Reply #28 on: February 07, 2009, 08:27:48 AM »
It need to check stop, depot, etc, and forbid it.
Ok. I will do this :)

...But here's a real issue, one can go into Simu-trans-dimensional with a simple enough trick :-D
Ups. Lost in space :) Edit: Since something similar is already possible, I will only prevent this, if simutrans is compiled with the 'ONLY_TUNNELS_BELOW_GROUND' setting in simconst.he
« Last Edit: February 07, 2009, 09:19:54 AM by gerw »

Offline gauthier

  • Devotee
  • *
  • Posts: 3629
    • SNFOS'website (in both FR and EN)
  • Languages: FR, EN, JP
Re: Slopes in tunnels
« Reply #29 on: February 07, 2009, 02:23:56 PM »
I added the two lines (not easy because of the horizontal presentation of the text ... I don't know why simuconf and menuconf are presented horizontally but in French I say : "c'est chiant !"). But no new toolbar, I looked at every toolbar but nothing new  :( >:(

The Transporter

  • Guest
Re: Slopes in tunnels
« Reply #30 on: February 07, 2009, 06:33:17 PM »
The 2 lines shoud be added to the menuconf.tab, section: specialtools. The 3. colum may be modified to work.

The "up" slope works fine, but the "down" slope shows a marker on the surface
« Last Edit: February 07, 2009, 06:39:29 PM by The Transporter »

Offline Frank

  • Inactive/Retired
  • *
  • Posts: 1431
  • Languages: DE
Re: Slopes in tunnels
« Reply #31 on: February 07, 2009, 06:47:39 PM »
The 2 lines shoud be added to the menuconf.tab, section: specialtools. The 3. colum may be modified to work.
...

this is different for paksets

The Transporter

  • Guest
Re: Slopes in tunnels
« Reply #32 on: February 07, 2009, 06:48:18 PM »
Using the underground slope gives extra money, exact +42947272,96 cr  :D

Offline Fabio

  • Devotee
  • Administrator
  • *
  • Posts: 2898
  • The Pak128 Guy
    • Visit me on Facebook
  • Languages: EN, IT, RO, FR
Re: Slopes in tunnels
« Reply #33 on: February 07, 2009, 07:52:43 PM »
this is awesome! congrats!

Offline gauthier

  • Devotee
  • *
  • Posts: 3629
    • SNFOS'website (in both FR and EN)
  • Languages: FR, EN, JP
Re: Slopes in tunnels
« Reply #34 on: February 07, 2009, 08:41:25 PM »
Can someone playing with pak128 send me his menuconf.tab ? It's driving me crazy !