diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /src/map.cpp | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | manaverse-stripped1.1.9.4.tar.gz manaverse-stripped1.1.9.4.tar.bz2 manaverse-stripped1.1.9.4.tar.xz manaverse-stripped1.1.9.4.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map.cpp b/src/map.cpp index 700f6d0d2..947bb8f09 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -918,7 +918,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY) } } - // Dont draw if gui opacity == 1 + // Don't draw if gui opacity == 1 if (mBeingOpacity && mOpacity != 1.0f) { // Draws beings with a lower opacity to make them visible @@ -2015,7 +2015,10 @@ void Map::reduce() { MapLayer *layer = *ri; if (x >= layer->mWidth || y >= layer->mHeight) + { + ++ ri; continue; + } Image *img = layer->mTiles[x + y * layer->mWidth]; if (img && !img->isAlphaVisible()) |