lazily load tile images to speedup startup times

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index 88f0063..5aa0734 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -30,7 +30,6 @@
 
 #include "app/globals.h"
 #include "app/setup.h"
-#include "camera.h"
 #include "video/screen.h"
 #include "level.h"
 #include "math/physic.h"
@@ -39,9 +38,11 @@
 #include "tile.h"
 #include "utils/lispreader.h"
 #include "resources.h"
-#include "gameobjs.h"
 #include "utils/lispwriter.h"
-#include "tilemap.h"
+#include "object/gameobjs.h"
+#include "object/camera.h"
+#include "object/tilemap.h"
+#include "object/coin.h"
 
 using namespace std;
 
@@ -52,16 +53,6 @@ Level::Level()
 }
 
 void
-Level::create(const std::string& filename)
-{
-  Level level;
-  const size_t width = 25;
-  const size_t height = 19;
-  level.add_sector(Sector::create("main", width, height));
-  level.save(filename);
-}
-
-void
 Level::load(const std::string& filepath)
 {
   LispReader* level = LispReader::load(filepath, "supertux-level");
@@ -165,13 +156,6 @@ Level::~Level()
 }
 
 void
-Level::do_vertical_flip()
-{
-  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-    i->second->do_vertical_flip();
-}
-
-void
 Level::add_sector(Sector* sector)
 {
   sectors.insert(std::make_pair(sector->get_name(), sector));       
@@ -241,21 +225,13 @@ Level::get_total_coins()
 {
   int total_coins = 0;
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
-    TileMap* solids = i->second->solids;
-    if(!solids) {
-      std::cerr << "Sector '" << i->first << "' contains no solids!?!\n";
-      continue;
+    Sector* sector = i->second;
+    for(Sector::GameObjects::iterator o = sector->gameobjects.begin();
+        o != sector->gameobjects.end(); ++o) {
+      Coin* coin = dynamic_cast<Coin*> (*o);
+      if(coin)
+        total_coins++;
     }
-    for(size_t x = 0; x < solids->get_width(); ++x)
-      for(size_t y = 0; y < solids->get_height(); ++y) {
-        const Tile* tile = solids->get_tile(x, y);
-        if(tile == 0) {
-          std::cerr << "Invalid tile in sector '" << i->first << "'.\n";
-          continue;
-        }
-        if(tile->attributes & Tile::COIN)
-          total_coins++;
-      }
   }
   return total_coins;
 }