summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-17 22:57:42 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-17 22:57:42 +0300
commit21f4d82b367750543ebfbc65df23e0863bf48c38 (patch)
tree63dfa3cda72741badf9810b6e215f912a44f5a8f /src/resources
parent3154e878e1f4c937807dfc94d1308049e94f9e65 (diff)
downloadmv-21f4d82b367750543ebfbc65df23e0863bf48c38.tar.gz
mv-21f4d82b367750543ebfbc65df23e0863bf48c38.tar.bz2
mv-21f4d82b367750543ebfbc65df23e0863bf48c38.tar.xz
mv-21f4d82b367750543ebfbc65df23e0863bf48c38.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp1
-rw-r--r--src/resources/map/mapheights.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index ad6d8f3e9..203858fa8 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -350,6 +350,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
case ItemType::USABLE:
itemInfo->addTag(mTags["Usable"]);
break;
+ case ItemType::CARD:
case ItemType::UNUSABLE:
itemInfo->addTag(mTags["Unusable"]);
break;
diff --git a/src/resources/map/mapheights.h b/src/resources/map/mapheights.h
index 149645b3d..5a5fa8243 100644
--- a/src/resources/map/mapheights.h
+++ b/src/resources/map/mapheights.h
@@ -37,7 +37,8 @@ class MapHeights final
void setHeight(const int x, const int y, const uint8_t height);
uint8_t getHeight(const int x, const int y) const
- { return x < mWidth && y < mHeight ? mTiles[x + y * mWidth] : 0; }
+ { return x < mWidth && y < mHeight ? mTiles[x + y * mWidth]
+ : static_cast<uint8_t>(0U); }
private:
int mWidth;