← Back to branch summary

~ubuntu-branches/ubuntu/raring/simutrans/raring-proposed

« back to all changes in this revision

Viewing changes to boden/wege/narrowgauge.cc

  • Committer: Package Import Robot
  • Author(s): Ansgar Burchardt
  • Date: 2011-11-03 19:59:02 UTC
  • mfrom: (1.2.7)
  • Revision ID: package-import@ubuntu.com-20111103195902-uopgwf488mfctb75
Tags: 111.0-1
* New upstream release.
* debian/rules: Update get-orig-source target for new upstream release.
* Use xz compression for source and binary packages.
* Use override_* targets to simplify debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
boden/wege/narrowgauge.cc
1
 
#include "../../simtypes.h"
2
 
#include "../../simdebug.h"
3
 
#include "../grund.h"
4
1
#include "../../bauer/wegbauer.h"
5
2
#include "../../besch/weg_besch.h"
6
3
 
16
13
}
17
14
 
18
15
 
19
 
 
20
 
void
21
 
narrowgauge_t::rdwr(loadsave_t *file)
 
16
void narrowgauge_t::rdwr(loadsave_t *file)
22
17
{
23
18
        schiene_t::rdwr(file);
24
19
 
25
20
        if(get_besch()->get_wtyp()!=narrowgauge_wt) {
26
21
                int old_max_speed = get_max_speed();
27
22
                const weg_besch_t *besch = wegbauer_t::weg_search( narrowgauge_wt, (old_max_speed>0 ? old_max_speed : 120), 0, (weg_t::system_type)((get_besch()->get_styp()==weg_t::type_elevated)*weg_t::type_elevated) );
 
23
                if (besch==NULL) {
 
24
                        dbg->fatal("narrowgauge_t::rwdr()", "No narrowgauge way available");
 
25
                }
28
26
                dbg->warning("narrowgauge_t::rwdr()", "Unknown way replaced by narrow gauge %s (old_max_speed %i)", besch->get_name(), old_max_speed );
29
27
                set_besch(besch);
30
28
                if(old_max_speed>0) {