When Esc was pressed the menu was not being shown in leveleditor (fixed).

[supertux.git] / src / world.cpp

diff --git a/src/world.cpp b/src/world.cpp
index 7c44e55..5e8857b 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1,7 +1,9 @@
 //  $Id$
 // 
 //  SuperTux
-//  Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -15,7 +17,8 @@
 // 
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
 
 #include <math.h>
 #include <stdlib.h>
@@ -33,14 +36,38 @@ Surface* img_distro[4];
 
 World* World::current_ = 0;
 
-World::World()
+World::World(const std::string& filename)
 {
   // FIXME: Move this to action and draw and everywhere else where the
   // world calls child functions
   current_ = this;
 
-  level = new Level;
+  level = new Level(filename);
   tux.init();
+
+  set_defaults();
+
+  get_level()->load_gfx();
+  activate_bad_guys();
+  activate_particle_systems();
+  get_level()->load_song();
+}
+
+World::World(const std::string& subset, int level_nr)
+{
+  // FIXME: Move this to action and draw and everywhere else where the
+  // world calls child functions
+  current_ = this;
+
+  level = new Level(subset, level_nr);
+  tux.init();
+
+  set_defaults();
+
+  get_level()->load_gfx();
+  activate_bad_guys();
+  activate_particle_systems();
+  get_level()->load_song();
 }
 
 World::~World()
@@ -63,35 +90,6 @@ World::set_defaults()
   set_current_music(LEVEL_MUSIC);
 }
 
-int
-World::load(const std::string& subset, int level_nr)
-{
-  return level->load(subset, level_nr);
-}
-
-int
-World::load(const std::string& filename)
-{
-  return level->load(filename);
-}
-
-void
-World::arrays_free(void)
-{
-  bad_guys.clear();
-  bouncy_distros.clear();
-  broken_bricks.clear();
-  bouncy_bricks.clear();
-  floating_scores.clear();
-  upgrades.clear();
-  bullets.clear();
-  std::vector<ParticleSystem*>::iterator i;
-  for(i = particle_systems.begin(); i != particle_systems.end(); ++i) {
-    delete *i;
-  }
-  particle_systems.clear();
-}
-
 void
 World::activate_bad_guys()
 {
@@ -128,14 +126,13 @@ World::draw()
   /* Draw the real background */
   if(get_level()->bkgd_image[0] != '\0')
     {
-      int s = (int)scroll_x / 30;
+      int s = ((int)scroll_x / 2)%640;
       level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h);
       level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h);
     }
   else
     {
-      drawgradient(level->bkgd_top_red, level->bkgd_top_green, level->bkgd_top_blue,
-                     level->bkgd_bottom_red, level->bkgd_bottom_green, level->bkgd_bottom_blue);
+      drawgradient(level->bkgd_top, level->bkgd_bottom);
     }
     
   /* Draw particle systems (background) */
@@ -209,6 +206,8 @@ World::draw()
 void
 World::action(double frame_ratio)
 {
+  tux.action(frame_ratio);
+
   /* Handle bouncy distros: */
   for (unsigned int i = 0; i < bouncy_distros.size(); i++)
     bouncy_distros[i].action(frame_ratio);
@@ -319,6 +318,7 @@ World::collision_handler()
           else
             {
               tux.collision(&bad_guys[i], CO_BADGUY);
+              bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_NORMAL);
             }
         }
     }
@@ -389,7 +389,7 @@ World::add_bad_guy(float x, float y, BadGuyKind kind)
 }
 
 void
-World::add_upgrade(float x, float y, int dir, int kind)
+World::add_upgrade(float x, float y, int dir, UpgradeKind kind)
 {
   Upgrade new_upgrade;
   new_upgrade.init(x,y,dir,kind);