News:

Simutrans.com Portal
Our Simutrans site. You can find everything about Simutrans from here.

Slopes in tunnels

Started by gerw, February 05, 2009, 07:00:57 PM

Previous topic - Next topic

0 Members and 2 Guests are viewing this topic.

gerw

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
toolbar[8][15]=general_tool[33],7
toolbar[8][16]=general_tool[34],7

to your menuconf.tab ]

DirrrtyDirk

I... I can't believe my eyes! Is it true? Or am I dreaming?
  
***** PAK128 Dev Team - semi-retired*****

wernieman

#2
I work on it ....
I hope you understand my English

IgorEliezer

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. ;)

Quote from: DirrrtyDirk on February 05, 2009, 07:08:09 PM
I... I can't believe my eyes! Is it true? Or am I dreaming?

*facepalm*

You are not.  ;D

ij

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 :-)).

Dwachs

Quote from: ij 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 :-)).

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 ;)
Parsley, sage, rosemary, and maggikraut.

wernieman

Shid .. I don't get it to work!
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
I hope you understand my English

isidoro

Quote from: DirrrtyDirk on February 05, 2009, 07:08:09 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...  ;)

VS

Mirage or miracle? ;) At last we will get a "full version" of underground mode!

My projects... Tools for messing with Simutrans graphics. Graphic archive - templates and some other stuff for painters. Development logs for most recent information on what is going on. And of course pak128!

gerw

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.

vilvoh


Escala Real...a blog about Simutrans in Spanish...


isidoro

Quote from: VS on February 05, 2009, 09:34:52 PM
Mirage or miracle? ;) At last we will get a "full version" of underground mode!

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

wernieman

So at the moment, I only need the last patch for the compiling?
I hope you understand my English

The Hood

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!

gerw

#15
Quote from: wernieman on February 06, 2009, 08:37:22 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
2 out of 46 hunks FAILED -- saving rejects to file simwerkz.cc.rej
but 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.

z9999

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.

wernieman

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 ...
I hope you understand my English

gerw

Quote from: z9999 on February 06, 2009, 12:08:19 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!

jamespetts

I am very impressed - this is an extremely useful feature!
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

VS

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.

My projects... Tools for messing with Simutrans graphics. Graphic archive - templates and some other stuff for painters. Development logs for most recent information on what is going on. And of course pak128!

DirrrtyDirk

Excellent work!

Hope this will make into the trunk among the new underground view soon.
  
***** PAK128 Dev Team - semi-retired*****

z9999

#22
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.

ij

@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

gauthier

#24
simply ... MAGNIFICAL ! Surely one of the better progress with rivers !

EDIT : just one thing ... How I must make these slopes ???

DirrrtyDirk

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).
  
***** PAK128 Dev Team - semi-retired*****

gauthier

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 ?

DirrrtyDirk

In the very first post in this thread it says:  ;)

Quote from: gerw on February 05, 2009, 07:00:57 PM
[ You have to append something like
toolbar[8][15]=general_tool[33],7
toolbar[8][16]=general_tool[34],7

to your menuconf.tab ]
  
***** PAK128 Dev Team - semi-retired*****

gerw

#28
Quote from: z9999 on February 06, 2009, 04:20:51 PM
It need to check stop, depot, etc, and forbid it.
Ok. I will do this :)

Quote from: ij on February 06, 2009, 08:35:02 PM
...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

gauthier

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

#30
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

Frank

Quote from: The Transporter 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.
...

this is different for paksets

The Transporter

Using the underground slope gives extra money, exact +42947272,96 cr  :D

Fabio

this is awesome! congrats!

gauthier

Can someone playing with pak128 send me his menuconf.tab ? It's driving me crazy !