From 21f4d82b367750543ebfbc65df23e0863bf48c38 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 17 Jul 2015 22:57:42 +0300 Subject: Fix code style. --- src/resources/db/itemdb.cpp | 1 + src/resources/map/mapheights.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/resources') 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(0U); } private: int mWidth; -- cgit v1.2.3-70-g09d2