-renamed ViewPort to Camera

[supertux.git] / src / tilemap.cpp

diff --git a/src/tilemap.cpp b/src/tilemap.cpp
index ba560c6..bb6a0ba 100644 (file)
--- a/src/tilemap.cpp
+++ b/src/tilemap.cpp
@@ -1,3 +1,23 @@
+//  $Id$
+//
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#include <assert.h>
+
 #include "tilemap.h"
 #include "display_manager.h"
 #include "level.h"
@@ -22,9 +42,9 @@ TileMap::action(float )
 }
 
 void
-TileMap::draw(ViewPort& viewport, int layer)
+TileMap::draw(Camera& viewport, int layer)
 {
-  std::vector<std::vector<unsigned int> >* tiles;
+  std::vector<unsigned int>* tiles;
   switch(layer) {
     case LAYER_BACKGROUNDTILES:
       tiles = &level->bg_tiles; break;
@@ -40,11 +60,11 @@ TileMap::draw(ViewPort& viewport, int layer)
   int tsy = int(viewport.get_translation().y / 32); // tilestartindex y
   int sx = - (int(viewport.get_translation().x) % 32);
   int sy = - (int(viewport.get_translation().y) % 32);
-  for(int x = sx, tx = tsx; x < screen->w && tx < int((*tiles)[0].size());
+  for(int x = sx, tx = tsx; x < screen->w && tx < level->width;
       x += 32, ++tx) {
-    for(int y = sy, ty = tsy; y < screen->h && ty < int(tiles->size());
+    for(int y = sy, ty = tsy; y < screen->h && ty < level->height;
           y += 32, ++ty) {
-      Tile::draw(x, y, (*tiles) [ty][tx]);
+      Tile::draw(x, y, (*tiles) [ty * level->width + tx]);
     }
   }
 }