X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=5aa073419bfe6e0158439ae19a099eb65669cd78;hb=2d97548e5cded4b201bbc10d6cec6232df03e9a4;hp=fd954a707eef44b53dbaf1381ed54ef505c6bc08;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index fd954a707..5aa073419 100644
--- 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,30 +53,8 @@ Level::Level()
 }
 
 void
-Level::create(const std::string& filename)
+Level::load(const std::string& filepath)
 {
-  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& filename)
-{
-  std::string filepath;
-  filepath = st_dir + "/levels/" + filename;
-  if (access(filepath.c_str(), R_OK) != 0)
-  {
-    filepath = datadir + "/levels/" + filename;
-    if (access(filepath.c_str(), R_OK) != 0)
-    {
-      std::cerr << "Error: Level: couldn't find level: " << filename << std::endl;
-      return;
-    }
-  }
-  
   LispReader* level = LispReader::load(filepath, "supertux-level");
 
   int version = 1;
@@ -138,36 +117,36 @@ Level::load_old_format(LispReader& reader)
 void
 Level::save(const std::string& filename)
 {
- std::string filepath = "levels/" + filename;
- int last_slash = filepath.find_last_of('/');
- FileSystem::fcreatedir(filepath.substr(0,last_slash).c_str());
- filepath = st_dir + "/" + filepath;
- ofstream file(filepath.c_str(), ios::out);
- LispWriter* writer = new LispWriter(file);
-
- writer->write_comment("Level made using SuperTux's built-in Level Editor");
-
- writer->start_list("supertux-level");
-
- int version = 2;
- writer->write_int("version", version);
-
- writer->write_string("name", name);
- writer->write_string("author", author);
- writer->write_int("time", timelimit);
- writer->write_string("end-sequence-animation",
-     end_sequence_type == FIREWORKS_ENDSEQ_ANIM ? "fireworks" : "none");
-
- for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
-   writer->start_list("sector");
-   i->second->write(*writer);
-   writer->end_list("sector");
- }
+  std::string filepath = "levels/" + filename;
+  int last_slash = filepath.find_last_of('/');
+  FileSystem::fcreatedir(filepath.substr(0,last_slash).c_str());
+  filepath = st_dir + "/" + filepath;
+  ofstream file(filepath.c_str(), ios::out);
+  LispWriter* writer = new LispWriter(file);
+
+  writer->write_comment("Level made using SuperTux's built-in Level Editor");
+
+  writer->start_list("supertux-level");
+
+  int version = 2;
+  writer->write_int("version", version);
+
+  writer->write_string("name", name);
+  writer->write_string("author", author);
+  writer->write_int("time", timelimit);
+  writer->write_string("end-sequence-animation",
+      end_sequence_type == FIREWORKS_ENDSEQ_ANIM ? "fireworks" : "none");
+
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    writer->start_list("sector");
+    i->second->write(*writer);
+    writer->end_list("sector");
+  }
 
- writer->end_list("supertux-level");
+  writer->end_list("supertux-level");
 
- delete writer;
- file.close();
+  delete writer;
+  file.close();
 }
 
 Level::~Level()
@@ -177,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));       
@@ -252,10 +224,14 @@ int
 Level::get_total_coins()
 {
   int total_coins = 0;
-  for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it)
-    for(int x = 0; static_cast<unsigned int>(x) < it->second->solids->get_width(); x++)
-      for(int y = 0; static_cast<unsigned int>(y) < it->second->solids->get_height(); y++)
-        if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN)
-          total_coins++;
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    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++;
+    }
+  }
   return total_coins;
 }