diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-16 21:52:46 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-16 21:52:46 +0300 |
commit | c77971cb8dc2fcb4613f58d863e184d23a762519 (patch) | |
tree | 73596d45ef9c450b96cd4699488f3f07a90dbdd8 | |
parent | 0d4fa49a591658989edb5b640d996b9dc93775d2 (diff) | |
download | plus-c77971cb8dc2fcb4613f58d863e184d23a762519.tar.gz plus-c77971cb8dc2fcb4613f58d863e184d23a762519.tar.bz2 plus-c77971cb8dc2fcb4613f58d863e184d23a762519.tar.xz plus-c77971cb8dc2fcb4613f58d863e184d23a762519.zip |
Fix other compilation warnings.
-rw-r--r-- | src/flooritem.cpp | 5 | ||||
-rw-r--r-- | src/flooritem.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/flooritem.cpp b/src/flooritem.cpp index b9d2f3cf3..4680a29b7 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -110,11 +110,10 @@ void FloorItem::postInit(Map *const map, int subX, int subY) } void FloorItem::setCards(const int *const cards, - const int size) + int sz) { - if (size < 0 || !cards) + if (sz < 0 || !cards) return; - int sz = size; if (sz > maxCards) sz = maxCards; for (int f = 0; f < sz; f ++) diff --git a/src/flooritem.h b/src/flooritem.h index ca4a5022e..d2cfa2c26 100644 --- a/src/flooritem.h +++ b/src/flooritem.h @@ -111,7 +111,7 @@ class FloorItem final : public ActorSprite { return mCursor; } void setCards(const int *const cards, - const int size); + int sz); private: int mCards[4]; |