~ubuntu-branches/debian/squeeze/simutrans/squeeze

« back to all changes in this revision

Viewing changes to dings/leitung2.cc

  • Committer: Bazaar Package Importer
  • Author(s): Ansgar Burchardt
  • Date: 2009-10-18 15:29:14 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20091018152914-ip7am3dx1tl27uyb
Tags: 102.2+svn2786-1
* New upstream release.
  + Refresh patches.
  + Update translations.
* debian/rules: Add get-orig-source target.
* debian/rules: Add update-translations target.
* debian/README.source: Document get-orig-source and update-translations
  targets.
* Bump Standards-Version to 3.8.3 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
80
80
leitung_t::leitung_t(karte_t *welt, loadsave_t *file) : ding_t(welt)
81
81
{
82
82
        set_net(NULL);
 
83
        ribi = ribi_t::keine;
83
84
        rdwr(file);
84
85
}
85
86
 
465
466
        image_id new_bild;
466
467
        if (!fab->is_currently_producing()) {
467
468
                new_bild = skinverwaltung_t::pumpe->get_bild_nr(0);
468
 
        } else {
 
469
        }
 
470
        else {
469
471
                // no input needed or has something to consume
470
472
                get_net()->add_power(fab->get_power());
471
473
                new_bild = skinverwaltung_t::pumpe->get_bild_nr(1);
541
543
        image_id new_bild;
542
544
        if(get_power>want_power/2) {
543
545
                new_bild = skinverwaltung_t::senke->get_bild_nr(1);
544
 
        } else {
 
546
        }
 
547
        else {
545
548
                new_bild = skinverwaltung_t::senke->get_bild_nr(0);
546
549
        }
547
550
        if(bild!=new_bild) {