The International Simutrans Forum

Development => Patches & Projects => Incorporated Patches and Solved Bug Reports => Topic started by: gerw on February 05, 2009, 07:00:57 PM

Title: Slopes in tunnels
Post by: gerw 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
toolbar[8][15]=general_tool[33],7
toolbar[8][16]=general_tool[34],7

to your menuconf.tab ]
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: DirrrtyDirk on February 05, 2009, 07:08:09 PM
I... I can't believe my eyes! Is it true? Or am I dreaming?
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: wernieman on February 05, 2009, 07:43:36 PM
I work on it ....
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: IgorEliezer 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. ;)

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
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: 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 :-)).

It certainly works though (at least for a single slope :-)).
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: Dwachs on February 05, 2009, 08:34:23 PM
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 ;)
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: wernieman on February 05, 2009, 08:38:07 PM
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
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: isidoro on February 05, 2009, 09:25:10 PM
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...  ;)
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: VS on February 05, 2009, 09:34:52 PM
Mirage or miracle? ;) At last we will get a "full version" of underground mode!
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: gerw 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.
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: vilvoh on February 05, 2009, 11:55:46 PM
simply...(http://www.greensmilies.com/smile/smiley_emoticons_hurra2.gif)
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: ansgar on February 06, 2009, 12:49:14 AM
This looks quite cool. :-)
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: isidoro on February 06, 2009, 02:18:01 AM
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.  :)
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: wernieman on February 06, 2009, 08:37:22 AM
So at the moment, I only need the last patch for the compiling?
Title: Re: A dream becomes true: Slopes in tunnels!
Post by: The Hood 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!
Title: Re: Slopes in tunnels
Post by: gerw on February 06, 2009, 09:20:04 AM
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.
Title: Re: Slopes in tunnels
Post by: z9999 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.
Title: Re: Slopes in tunnels
Post by: wernieman on February 06, 2009, 12:58:37 PM
I compiled it, see http://patches.simutrans-germany.com/ (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 ...
Title: Re: Slopes in tunnels
Post by: gerw on February 06, 2009, 12:59:26 PM
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!
Title: Re: Slopes in tunnels
Post by: jamespetts on February 06, 2009, 03:26:16 PM
I am very impressed - this is an extremely useful feature!
Title: Re: Slopes in tunnels
Post by: VS 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.
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk on February 06, 2009, 03:51:42 PM
Excellent work!

Hope this will make into the trunk among the new underground view soon.
Title: Re: Slopes in tunnels
Post by: z9999 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.
Title: Re: Slopes in tunnels
Post by: ij 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
Title: Re: Slopes in tunnels
Post by: gauthier 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 ???
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk 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).
Title: Re: Slopes in tunnels
Post by: gauthier 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 ?
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk on February 06, 2009, 10:15:47 PM
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 ]
Title: Re: Slopes in tunnels
Post by: gerw on February 07, 2009, 08:27:48 AM
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
Title: Re: Slopes in tunnels
Post by: gauthier 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  :( >:(
Title: Re: Slopes in tunnels
Post by: 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.

The "up" slope works fine, but the "down" slope shows a marker on the surface
Title: Re: Slopes in tunnels
Post by: Frank on February 07, 2009, 06:47:39 PM
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
Title: Re: Slopes in tunnels
Post by: The Transporter on February 07, 2009, 06:48:18 PM
Using the underground slope gives extra money, exact +42947272,96 cr  :D
Title: Re: Slopes in tunnels
Post by: Fabio on February 07, 2009, 07:52:43 PM
this is awesome! congrats!
Title: Re: Slopes in tunnels
Post by: gauthier on February 07, 2009, 08:41:25 PM
Can someone playing with pak128 send me his menuconf.tab ? It's driving me crazy !
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk on February 07, 2009, 08:47:59 PM
Here.

Tools are at the end of the Special Tools menu (2x crane icon).

Remember: regular nightlies without this patch will not run with these entries in menuconf.tab !
Title: Re: Slopes in tunnels
Post by: gauthier on February 07, 2009, 10:58:25 PM
ok ;) thanks a lot.

Yeah it works !
Title: Re: Slopes in tunnels
Post by: jamespetts on February 07, 2009, 11:37:14 PM
Most impressive!
Title: Re: Slopes in tunnels
Post by: gerw on February 08, 2009, 10:20:17 AM
Quote from: gauthier on February 07, 2009, 02:23:56 PM
not easy because of the horizontal presentation of the text ... I don't know why simuconf and menuconf are presented horizontally
My guess: you are using windows' notepad? Try wordpad instead.
Title: Re: Slopes in tunnels
Post by: gauthier on February 08, 2009, 10:38:48 AM
I already saw a menuconf.tab verticaly presented in notepad :/
Title: Re: Slopes in tunnels
Post by: gerw on February 08, 2009, 10:45:06 AM
This is caused by the fact that line breaks are handled differently on different systems (http://en.wikipedia.org/wiki/Newline#Representations).
Title: Re: Slopes in tunnels
Post by: jamespetts on February 08, 2009, 11:25:50 AM
If in Windows, use WordPad rather than Notepad, which handles line breaks much better.
Title: Re: Slopes in tunnels
Post by: The Transporter on February 08, 2009, 05:03:06 PM
New Version is out ;D
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk on February 08, 2009, 05:12:57 PM
I think the new version is about the "new underground view" patch, not this one here about UG slopes...
Title: Re: Slopes in tunnels
Post by: wernieman on February 08, 2009, 05:17:07 PM
I make a new one if somebody make a new sloop.patch ...  8)
Title: Re: Slopes in tunnels
Post by: gerw on February 08, 2009, 05:39:01 PM
Quote from: wernieman on February 08, 2009, 05:17:07 PM
I make a new one if somebody make a new sloop.patch ...  8)

I think I will make post a new version of my patch this evening. I will also append a patch which includes the underground view.
Title: Re: Slopes in tunnels
Post by: gauthier on February 08, 2009, 05:40:15 PM
just :
Thanks, with the opening of the 3rd dimension underground, I will transform this poor ground into ... a big piece of gruyere ! just like Pari with the METRO  :P ;D ;)
(http://www.fidunion.com/images/metro_sm.gif)
(http://sfjacques1966.free.fr/pub/070628_ratp_metro_texte.jpg)
(http://www.plan-de-metro.fr/img/metro.jpg)
Title: Re: Slopes in tunnels
Post by: gerw on February 08, 2009, 05:52:51 PM
An comprehensive test :) Nice screenshot!

Now you can build crazy junctions in underground. OTTD junction: http://wiki.openttd.org/wiki/index.php/Image:NewQBMJ.png (http://wiki.openttd.org/wiki/index.php/Image:NewQBMJ.png) Who is first?
Title: Re: Slopes in tunnels
Post by: Stubbsy on February 08, 2009, 05:55:28 PM
I feel really stupid now, but HOW THE HELL DO YOU GET THE SLOPES!!?? lol, i just can't seem to find out  :( ???
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk on February 08, 2009, 06:00:26 PM
Seems like right now, you can't. The previous .exe is no longer available on http://patches.simutrans-germany.com/ but wernieman will surely put another version up there, when available.
Title: Re: Slopes in tunnels
Post by: VS on February 08, 2009, 06:00:56 PM
Gerw, that is monstrous. I hope Simutrans can avoid explicit need for such structures in any situation... Oh, and I can already spot some design mistakes :P
Title: Re: Slopes in tunnels
Post by: DirrrtyDirk on February 08, 2009, 06:08:22 PM
@VS: you (already) spotted mistakes?  :o

Wow! That thing is so huge and complex that I haven't even begun figuring it out. But luckily, on the other hand, I can hardly think of a network that really requires such a construction - or even anything close. Or am I missing anything there?
Title: Re: Slopes in tunnels
Post by: Frank on February 08, 2009, 06:21:23 PM
Quote from: DirrrtyDirk on February 08, 2009, 06:00:26 PM
Seems like right now, you can't. The previous .exe is no longer available on http://patches.simutrans-germany.com/ but wernieman will surely put another version up there, when available.

restore
Title: Re: Slopes in tunnels
Post by: VS on February 08, 2009, 06:22:24 PM
I did not look too closely, but it is obvious that going up from tunnel on a bridge to cross a track is not too clever ;) And no, there isn't another tunnel under that.

(Oh and because of the required symmetry if forms an almost-swastika.)
Title: Re: Slopes in tunnels
Post by: jamespetts on February 08, 2009, 06:56:44 PM
Hmm, if junctions like that are necessary, there's something horribly wrong in the balancing somewhere requiring far too high a capacity.
Title: Re: Slopes in tunnels
Post by: gerw on February 08, 2009, 08:47:04 PM
New patches are out! Now the bugs posted in this thread are fixed - except the 'under water bug'. But I think this one can solved by allow viewing under water (maybe 2 levels) and prohibit too low tunnels.

Additional thanks to dwachs, who figured out whats going on with this orange markers!
Title: Re: Slopes in tunnels
Post by: wernieman on February 09, 2009, 08:19:13 AM
I must use both Patches?

Then I get a Problem ...

simutrans@birgit ~/comp2 $ cat nohup.out
patching file simwerkz.cc
patching file simwerkz.h
patching file simmenu.h
patching file Makefile
patching file simplan.cc
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 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 #21 succeeded at 1714 with fuzz 2 (offset 14 lines).
Hunk #22 succeeded at 1771 (offset 14 lines).
Hunk #23 succeeded at 1975 (offset 14 lines).
Hunk #24 succeeded at 2338 (offset 14 lines).
Hunk #25 succeeded at 2350 (offset 14 lines).
Hunk #26 succeeded at 2571 (offset 14 lines).
Hunk #27 succeeded at 2640 (offset 14 lines).
Hunk #28 succeeded at 2735 (offset 14 lines).
Hunk #29 succeeded at 2787 (offset 14 lines).
Hunk #30 succeeded at 2834 (offset 14 lines).
Hunk #31 succeeded at 2850 (offset 14 lines).
Hunk #32 succeeded at 2892 (offset 14 lines).
Hunk #33 succeeded at 2974 (offset 14 lines).
Hunk #34 succeeded at 3071 (offset 14 lines).
Hunk #35 succeeded at 3144 (offset 14 lines).
Hunk #36 succeeded at 3303 (offset 14 lines).
Hunk #37 succeeded at 3356 (offset 14 lines).
Hunk #38 succeeded at 3390 (offset 14 lines).
Hunk #39 succeeded at 3423 (offset 14 lines).
Hunk #40 succeeded at 3472 (offset 14 lines).
Hunk #41 succeeded at 3512 (offset 14 lines).
Hunk #42 succeeded at 3551 (offset 14 lines).
Hunk #43 succeeded at 3687 (offset 14 lines).
Hunk #44 succeeded at 3758 (offset 14 lines).
1 out of 44 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/colors.h
patching file gui/fahrplan_gui.cc
patching file simworld.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 boden/tunnel_ceiling.cc
patching file boden/tunnel_ceiling.h
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 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.
8 out of 8 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
Title: Re: Slopes in tunnels
Post by: Dwachs on February 09, 2009, 08:33:26 AM
No! the first file contains both patches (underground view + slopes), whereas the second one contains only the slope patch (I think). Both patch files are against a clean simutrans.

Klaro?  :)
Title: Re: Slopes in tunnels
Post by: wernieman on February 09, 2009, 08:46:54 AM
O.K. ....

My Script use for patching a realy clean simutrans ... every time ;o)
Title: Re: Slopes in tunnels
Post by: Frank on February 09, 2009, 08:59:04 AM
compile MS VC++ 2005 EE

r2310 + file underground_view_slopes-2310.patch

Quotesimplan.obj : error LNK2001: Nicht aufgelöstes externes Symbol ""public: virtual void __thiscall tunnel_ceiling_t::rdwr(class loadsave_t *)" (?rdwr@tunnel_ceiling_t@@UAEXPAVloadsave_t@@@Z)".
Quotetunnelbauer.obj : error LNK2001: Nicht aufgelöstes externes Symbol ""public: __thiscall tunnel_ceiling_t::tunnel_ceiling_t(class karte_t *,class koord3d)" (??0tunnel_ceiling_t@@QAE@PAVkarte_t@@Vkoord3d@@@Z)".
Title: Re: Slopes in tunnels
Post by: Dwachs on February 09, 2009, 09:01:39 AM
I think you have to add the file boden/tunnel-ceiling.cc manually to the visual studio project.
Title: Re: Slopes in tunnels
Post by: gerw on February 09, 2009, 09:07:45 AM
I thought, I forget 'svn add' again, but this time all files are included in the patch. And dwachs is right: the first file contains both patches and the second only the slope patch. Both against clear r2310.
Title: Re: Slopes in tunnels
Post by: Frank on February 09, 2009, 09:10:18 AM
thanks, Dwachs it work

this warning

Quote...\untergrund_2310\besch\way_obj_besch.h(190) : warning C4715: "way_obj_besch_t::has_diagonal_bild": Nicht alle Steuerelementpfade geben einen Wert zurück.
Title: Re: Slopes in tunnels
Post by: Dwachs on February 09, 2009, 09:20:03 AM
.. has nothing to do with the patches here :)
Title: Re: Slopes in tunnels
Post by: wernieman on February 09, 2009, 10:26:57 AM
I put new Versions in patches.simutrans-germany.com

Atention: I dont test them!!!
Title: Re: Slopes in tunnels
Post by: The Transporter on February 09, 2009, 01:40:35 PM
After a short Test: it works fine
Title: Re: Slopes in tunnels
Post by: SQ285 on February 09, 2009, 03:38:36 PM
can anyone post the tutorial of slope in tunnels?
Title: Re: Slopes in tunnels
Post by: jamespetts on February 09, 2009, 05:12:36 PM
SQ - it's an experimental feature as yet, so I don't think that a full tutorial is available. This thread might contain some information as to how to use them somewhere. Hopefully, if/when the feature is integrated into the main version, information will be added to the help files on how to use it.
Title: Re: Slopes in tunnels
Post by: The Transporter on February 16, 2009, 01:15:26 PM
Great Work,
No touble after a lot of Hours testing.
Could you please use "up" and "down" Arrows for changing the Underground view. It would be better than the "left" and "right" Arrows
Title: Re: Slopes in tunnels
Post by: Dwachs on February 16, 2009, 01:38:03 PM
Quote from: The Transporter on February 16, 2009, 01:15:26 PM
Could you please use "up" and "down" Arrows for changing the Underground view. It would be better than the "left" and "right" Arrows

You mean in the 'Display dialogue' ? I will look, how this could be done.
Title: Re: Slopes in tunnels
Post by: wernieman on February 22, 2009, 11:44:16 AM
Will there be a new version?
Title: Re: Slopes in tunnels
Post by: gerw on February 22, 2009, 03:29:53 PM
Here are new versions against r2329. As usual, the first patch includes also Dwachs' underground view.
Title: Re: Slopes in tunnels
Post by: wernieman on February 23, 2009, 06:12:20 PM
I try and try ... and get an compiler error:
===> CXX bauer/tunnelbauer.cc
In file included from simplan.h:12,
                 from simworld.h:30,
                 from simwerkz.h:13,
                 from bauer/tunnelbauer.h:16,
                 from bauer/tunnelbauer.cc:13:
boden/grund.h: In member function `sint8 grund_t::get_disp_slope() const':
boden/grund.h:407: Warnung: enumeral and non-enumeral type in conditional
   expression
bauer/tunnelbauer.cc:29:37: ../boden/tunnel_ceiling.h: Datei oder Verzeichnis nicht gefunden
bauer/tunnelbauer.cc: In static member function `static const char*
   tunnelbauer_t::build_slope(karte_t*, spieler_t*, koord3d, bool)':
bauer/tunnelbauer.cc:588: error: Syntaxfehler before `(' token
make: *** [bauer/tunnelbauer.o] Fehler 1
Title: Re: Slopes in tunnels
Post by: Dwachs on February 23, 2009, 06:45:17 PM
the files boden/ceiling.* are missing in the first patch file  ::) maybe you can take them (and only them) from the second (smaller) patch file.
Title: Re: Slopes in tunnels
Post by: wernieman on February 23, 2009, 07:33:05 PM
Mhhh ... I could, but at the Moment I am ill at home.. so I don't like to use my brain (sorry ....)
Title: Re: Slopes in tunnels
Post by: gerw on February 25, 2009, 08:36:49 AM
Now with tunnel_ceiling.
Please use r2329, otherwise there will be conflicts.
Title: Re: Slopes in tunnels
Post by: wernieman on February 25, 2009, 12:06:43 PM
I have a Problem with the Server. When I solved them I compile your patch ...

Edit:
There will be a new Version on patches.simutrans-germany.com next week (I hope)
Sorry for the waiting, but there are personal reasons ...
Title: Re: Slopes in tunnels
Post by: wernieman on March 09, 2009, 08:45:15 AM
So .. I have a new Server and I whant to test him .. with your Patch ....

(Sorry for the waiting)

could I use it with the newest Version ore need I the Version r2329?
Title: Re: Slopes in tunnels
Post by: gerw on March 14, 2009, 12:44:14 PM
Sorry, that I'm answering late, but I didn't have access to the internet last week.

Currently, this patch will cause conflicts with new versions. I think there will be a new version next week (Wednsday or Thursday).
Title: Re: Slopes in tunnels
Post by: gerw on March 19, 2009, 04:52:37 PM
Here is a new version (of both patches) against r2391.
Title: Re: Slopes in tunnels
Post by: gerw on March 20, 2009, 08:38:37 PM
New version with the newest version of the underground view by dwachs.
Title: Re: Slopes in tunnels
Post by: The Transporter on March 25, 2009, 11:14:18 PM
Will be a new version on simutrans-germany.com?
Title: Re: Slopes in tunnels
Post by: Mac_#71 on April 05, 2009, 04:44:06 PM
I downloaded the patch and the menuconf for 2391, where i can find the modified .exe?
Title: Re: Slopes in tunnels
Post by: wernieman on April 05, 2009, 09:09:15 PM
So now I sove the problem with my nightly-simutrans. So, I could make a new compilat for this patch.

Should I try with 2391 or if there a new version in the next week?
Title: Re: Slopes in tunnels
Post by: gerw on April 06, 2009, 07:05:22 AM
If I have some time, I will post a new version this week.
Title: Re: Slopes in tunnels
Post by: MoTw on April 06, 2009, 04:45:22 PM
sorry if this question has been answered before but i couldn't find it...

How can I get these patches work in Simutrans 102 (r2366)? Are these only .exe-files?  ???

MoTw

Title: Re: Slopes in tunnels
Post by: wernieman on April 06, 2009, 05:14:23 PM
a patch file is a simple code. So you get no exe or .... you must compile simutrans fith the simutramns-code + the patchfile.

Or you can wait that somebody compile it for you
Title: Re: Slopes in tunnels
Post by: blitzmaster on April 07, 2009, 10:57:08 AM
could we probably make a pinned topic that explains what patch files are? this question is asked in virtually every topic relating to some patch....
Title: Re: Slopes in tunnels
Post by: jamespetts on April 07, 2009, 02:05:33 PM
There is already a sticky explaining patches here (http://forum.simutrans.com/index.php?topic=1349.0), although perhaps it should be in the main forum, rather than a subforum.
Title: Re: Slopes in tunnels
Post by: blitzmaster on April 07, 2009, 02:52:08 PM
well, it doesn't explain how to "use" this patch files (namely compiling rather than trying to execute them...), which is asked virtually every time...
Title: Re: Slopes in tunnels
Post by: VS on April 07, 2009, 03:48:03 PM
blitzmaster - write what you would like to see and I'll make sure it gets to the right place.

(this tangent solved)
Title: Re: Slopes in tunnels
Post by: gerw on April 07, 2009, 04:10:21 PM
Patch against 2411.

Edit: Unfortunately this patch contains only the underground view...
Title: Re: Slopes in tunnels
Post by: wernieman on April 08, 2009, 08:52:11 AM
I make a Compiler-Run für Linux (gcc3/4) and Windows (SDL/GDI)

Edit:
A new Compilerrun, see gerw post ...
Title: Re: Slopes in tunnels
Post by: z9999 on April 08, 2009, 11:03:42 AM
Quote from: gerw on April 07, 2009, 04:10:21 PM
Patch against 2411.

What is this patch for ?
The filename contains "slope", but patch doesn't seem to have underground slope tool.

How can I use both underground slope and underground view ?
There are many similar patches, they are difficult to understand for me.
Title: Re: Slopes in tunnels
Post by: gerw on April 08, 2009, 11:14:42 AM
It's my fault. Maybe I've done "svn diff" in the wrong directory? I will have a look for it.

Edit: Patch attached.
Title: Re: Slopes in tunnels
Post by: z9999 on April 08, 2009, 04:06:49 PM
Thank you, it worked.
I could dig deeper with new climate tool (http://forum.simutrans.com/index.php?topic=1861.0).  ;)
Title: Re: Slopes in tunnels
Post by: wernieman on April 08, 2009, 08:49:49 PM
I use the Version 2412 with your patch .... I hope it is O.K.

Look at the patchserver for the programm http://patches.simutrans-germany.com/ (http://patches.simutrans-germany.com/)
Title: Re: Slopes in tunnels
Post by: z9999 on April 09, 2009, 07:08:02 AM
Freeze with road removing tool.
Title: Re: Slopes in tunnels
Post by: gerw on April 09, 2009, 08:21:37 AM
Fix freeze.
Title: Re: Slopes in tunnels
Post by: wernieman on April 09, 2009, 01:34:01 PM
New Version on the patches Server
http://patches.simutrans-germany.com/ (http://patches.simutrans-germany.com/)

And .. can you give me a "Patch-Version-Number"?
Without it is not easy to see,if there is a new Version ...
Title: Re: Slopes in tunnels
Post by: z9999 on April 09, 2009, 06:32:38 PM
When I build a tunnel in underground mode, simutrans quit without any error dialog.

Title: Re: Slopes in tunnels
Post by: sojo on April 09, 2009, 07:28:08 PM
I had the same problem with the track-tunnel.
Title: Re: Slopes in tunnels
Post by: gerw on April 10, 2009, 04:01:59 PM
This is a simple (wrong) assertion.
Title: Re: Slopes in tunnels
Post by: prissi on April 10, 2009, 08:15:32 PM
Since the cursor, tool, and slice underground mode will be redesigned for better acessibility of different height levels, I think the slopes will be introduced as normal slopes without further additions.
Title: Re: Slopes in tunnels
Post by: gerw on April 12, 2009, 06:08:27 PM
Quote from: prissi on April 10, 2009, 08:15:32 PM
I think the slopes will be introduced as normal slopes without further additions.
In difference to what?
Title: Re: Slopes in tunnels
Post by: MHD on April 16, 2009, 06:56:02 PM
Same with me here.

I assume, to build an underground track works as usual: Start with a Ctrl+Tunnel and continue to work on the tracks (since building a track in underground mode is not working).

This leads to a crash on desktop and I even didn't get a log file.

I patched the latest nightly...

Greetings, Oliver
Title: Re: Slopes in tunnels
Post by: Dwachs on April 16, 2009, 07:17:04 PM
There is a notorious bug in some patch files. Does it help, if you change the following assert(..) statement in bauer/tunnelbauer.cc ??

const char *tunnelbauer_t::baue( karte_t *welt, spieler_t *sp, koord pos, const tunnel_besch_t *besch )
{
assert( besch ); // delete the reference to underground_mode here!
Title: Re: Slopes in tunnels
Post by: gerw on April 16, 2009, 09:01:30 PM
Somehow the directory, where I have applied both patches get messed up...