← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bauer/warenbauer.cc

  • Committer: Bazaar Package Importer
  • Author(s): Ansgar Burchardt
  • Date: 2010-03-12 09:23:35 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20100312092335-nb88gufrs0nfi4pv
Tags: 102.2.2~ds1-1
* New upstream release.
  + debian/rules: Update get-orig-source target.
  + debian/rules: Add build-dep on libbz2-dev.
  + debian/rules: Bump dependency on simutrans-pak64 to 102.2.1.
    See also #565493.
  + Refresh patches.
* Update translations.
  + debian/rules: Update list of excluded languages.
* Correct spelling errors.
  + new patch: spelling.patch
* Bump Standards-Version to 3.8.4 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bauer/warenbauer.cc
1
1
/*
2
 
 * Copyright (c) 1997 - 2002 Hansj�rg Malthaner
 
2
 * Copyright (c) 1997 - 2002 Hj. Malthaner
3
3
 *
4
4
 * This file is part of the Simutrans project under the artistic licence.
5
5
 * (see licence.txt)
11
11
#include "../simware.h"
12
12
#include "../simcolor.h"
13
13
#include "warenbauer.h"
 
14
#include "../dataobj/translator.h"
14
15
 
15
16
 
16
17
stringhashtable_tpl<const ware_besch_t *> warenbauer_t::besch_names;
147
148
const ware_besch_t *
148
149
warenbauer_t::get_info(const char* name)
149
150
{
150
 
        const ware_besch_t* t = besch_names.get(name);
151
 
        if(t == NULL) {
152
 
                dbg->fatal("warenbauer_t::get_info()", "No info for good '%s' available", name);
 
151
        const ware_besch_t *ware = besch_names.get(name);
 
152
        if (ware==NULL) {
 
153
                ware = besch_names.get(translator::compatibility_name(name));
153
154
        }
154
 
        return t;
 
155
        return ware;
155
156
}
156
157
 
157
158