← Back to branch summary

~ubuntu-branches/ubuntu/vivid/manaplus/vivid

« back to all changes in this revision

Viewing changes to src/resources/db/itemdb.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2015-02-05 10:52:57 UTC
  • mfrom: (1.1.43)
  • Revision ID: package-import@ubuntu.com-20150205105257-q53e3m1s2wwawu8a
Tags: 1.5.1.31-1
* New upstream release.
* Fix some wildcard-matches-nothing-in-dep5-copyright warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/resources/db/itemdb.cpp
147
147
    {
148
148
        const ItemTypeMap &item = itemTypeMap[f];
149
149
        if (item.type == type)
 
150
        {
 
151
            if (item.useButton.empty())
 
152
                return std::string();
150
153
            return gettext(item.useButton.c_str());
 
154
        }
151
155
    }
152
156
    logger->log("Unknown item type");
153
157
    return std::string();
160
164
    {
161
165
        const ItemTypeMap &item = itemTypeMap[f];
162
166
        if (item.type == type)
 
167
        {
 
168
            if (item.useButton2.empty())
 
169
                return std::string();
163
170
            return gettext(item.useButton2.c_str());
 
171
        }
164
172
    }
165
173
    logger->log("Unknown item type");
166
174
    return std::string();