diff options
| -rw-r--r-- | src/graphics.cpp | 5 | ||||
| -rw-r--r-- | src/graphics.h | 2 | ||||
| -rw-r--r-- | src/map.cpp | 14 | ||||
| -rw-r--r-- | src/map.h | 14 | ||||
| -rw-r--r-- | src/opengl1graphics.cpp | 5 |
5 files changed, 10 insertions, 30 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp index 88e88a905..c5163f791 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -889,8 +889,3 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle) SDL_FillRect(mTarget, &rect, color); } } - -void Graphics::drawMapLayer(MapLayer *layer) -{ - -} diff --git a/src/graphics.h b/src/graphics.h index d6e5f774c..237d16dc2 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -269,8 +269,6 @@ class Graphics : public gcn::SDLGraphics bool getRedraw() { return mRedraw; } - void drawMapLayer(MapLayer *layer); - int mWidth; int mHeight; diff --git a/src/map.cpp b/src/map.cpp index 4da46c4a8..838a2c68f 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -282,9 +282,7 @@ void MapLayer::updateSDL(Graphics *graphics, int startX, int startY, } } -void MapLayer::drawSDL(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY, - int debugFlags) +void MapLayer::drawSDL(Graphics *graphics) { MapRows::iterator rit = mTempRows.begin(); MapRows::iterator rit_end = mTempRows.end(); @@ -372,9 +370,7 @@ void MapLayer::updateOGL(Graphics *graphics, int startX, int startY, } } -void MapLayer::drawOGL(Graphics *graphics, int startX, int startY, - int endX, int endY, int scrollX, int scrollY, - int debugFlags) +void MapLayer::drawOGL(Graphics *graphics) { MapRows::iterator rit = mTempRows.begin(); MapRows::iterator rit_end = mTempRows.end(); @@ -874,8 +870,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY) endX, endY, scrollX, scrollY, mDebugFlags); } - (*layeri)->drawOGL(graphics, startX, startY, endX, endY, - scrollX, scrollY, mDebugFlags); + (*layeri)->drawOGL(graphics); } else { @@ -886,8 +881,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY) endX, endY, scrollX, scrollY, mDebugFlags); } - (*layeri)->drawSDL(graphics, startX, startY, endX, endY, - scrollX, scrollY, mDebugFlags); + (*layeri)->drawSDL(graphics); */ (*layeri)->draw(graphics, startX, startY, endX, endY, scrollX, scrollY, mDebugFlags); @@ -179,17 +179,9 @@ class MapLayer: public ConfigListener int scrollX, int scrollY, int mDebugFlags) const; - void drawOGL(Graphics *graphics, - int startX, int startY, - int endX, int endY, - int scrollX, int scrollY, - int mDebugFlags); - - void drawSDL(Graphics *graphics, - int startX, int startY, - int endX, int endY, - int scrollX, int scrollY, - int mDebugFlags); + void drawOGL(Graphics *graphics); + + void drawSDL(Graphics *graphics); void updateOGL(Graphics *graphics, int startX, int startY, diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index beffb462e..d40784aff 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -414,12 +414,13 @@ bool OpenGL1Graphics::calcImageRect(GraphicsVertexes* vert, return true; } -void OpenGL1Graphics::calcTile(ImageVertexes *vert, int x, int y) +void OpenGL1Graphics::calcTile(ImageVertexes *vert A_UNUSED, + int x A_UNUSED, int y A_UNUSED) { } -void OpenGL1Graphics::drawTile(ImageVertexes *vert) +void OpenGL1Graphics::drawTile(ImageVertexes *vert A_UNUSED) { } |