diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-12 18:39:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-12 18:39:00 +0300 |
commit | 351821c1f18f9285be58df0a05339936311f6490 (patch) | |
tree | 47a60cad4f61f63c5ac2faf98dcae24760d7fe11 /src/map.cpp | |
parent | e50632a83a3c679cffd372656277a304d5d853f8 (diff) | |
download | manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.gz manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.bz2 manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.xz manaplus-351821c1f18f9285be58df0a05339936311f6490.zip |
first part of style fixed after cpplint checks.
Diffstat (limited to 'src/map.cpp')
-rw-r--r-- | src/map.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map.cpp b/src/map.cpp index ceb863359..94b797d43 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -257,7 +257,7 @@ void Map::initializeAmbientLayers() } else { - break; // the FOR loop + break; // the FOR loop } Image *const img = resman->getImage(getProperty(name + "image")); @@ -510,8 +510,8 @@ void Map::draw(Graphics *const graphics, int scrollX, int scrollY) graphics->setColor(userPalette->getColorWithAlpha(\ UserPalette::color));\ graphics->fillRectangle(gcn::Rectangle(\ - x0 * mTileWidth - scrollX,\ - y * mTileHeight - scrollY,\ + x0 * mTileWidth - scrollX, \ + y * mTileHeight - scrollY, \ width, 32));\ }\ }\ @@ -566,7 +566,7 @@ void Map::drawCollision(Graphics *const graphics, void Map::updateAmbientLayers(const float scrollX, const float scrollY) { BLOCK_START("Map::updateAmbientLayers") - static int lastTick = tick_time; // static = only initialized at first call + static int lastTick = tick_time; // static = only initialized at first call if (mLastAScrollX == 0.0f && mLastAScrollY == 0.0f) { @@ -1230,7 +1230,7 @@ void Map::saveExtraLayer() const std::string Map::getUserMapDirectory() const { - return Client::getServerConfigDirectory() + + return Client::getServerConfigDirectory() + dirSeparator + getProperty("_realfilename"); } |