diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-29 18:33:44 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-29 18:33:44 +0200 |
| commit | 9587fb9b86ee4081ba14d23c1133bf1a09ee4578 (patch) | |
| tree | 7682df3ec17534be553caae85ffa9e5a68c9a815 /src/map.cpp | |
| parent | 63b41440a0555c6b39141eab94ef4627f712b476 (diff) | |
| parent | 8748f26234bba1e71bbe059147fb02256f8cec2a (diff) | |
| download | mana-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.gz mana-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.bz2 mana-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.xz mana-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map.cpp b/src/map.cpp index 59e6201f..0dc4759e 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -48,7 +48,9 @@ struct Location /** * Constructor. */ - Location(int px, int py, MetaTile *ptile):x(px),y(py),tile(ptile) {}; + Location(int px, int py, MetaTile *ptile): + x(px), y(py), tile(ptile) + {} /** * Comparison operator. @@ -141,11 +143,7 @@ void MapLayer::draw(Graphics *graphics, int startX, int startY, // tiles have been drawn if (mIsFringeLayer) { -#ifdef TMWSERV_SUPPORT while (si != sprites.end() && (*si)->getPixelY() <= y * 32) -#else - while (si != sprites.end() && (*si)->getPixelY() <= y * 32) -#endif { (*si)->draw(graphics, -scrollX, -scrollY); si++; |