summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-21 22:44:44 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-21 23:18:20 +0300
commit62ffd2023d9073e452fe2e2f50cf6b2f11224d6f (patch)
tree8c45c7c16b0c20ac6a7b722d69c148149e6b651f /src/map.cpp
parentcfa5391c1be51ef49380e398a72c813255d6316e (diff)
downloadManaVerse-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.gz
ManaVerse-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.bz2
ManaVerse-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.xz
ManaVerse-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.zip
next code style changes.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 3d09a0d4a..cce5d6419 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -811,7 +811,7 @@ Path Map::findPixelPath(int startPixelX, int startPixelY, int endPixelX,
float endOffsetX = static_cast<float>(endPixelX % 32);
float endOffsetY = static_cast<float>(endPixelY % 32);
- int sz = myPath.size();
+ int sz = static_cast<int>(myPath.size());
// Find the distance, and divide it by the number of steps
int changeX = static_cast<int>((endOffsetX - startOffsetX)
/ static_cast<float>(sz));
@@ -1359,7 +1359,8 @@ void Map::indexTilesets()
return;
}
- const int size = static_cast<int>(s->getFirstGid()) + s->size();
+ const int size = static_cast<int>(s->getFirstGid())
+ + static_cast<int>(s->size());
mIndexedTilesetsSize = size;
mIndexedTilesets = new Tileset*[size];
std::fill_n(mIndexedTilesets, size, static_cast<Tileset*>(nullptr));