From: Ingo Ruhnke <grumbel@gmail.com>
Date: Wed, 13 Aug 2014 21:35:20 +0000 (+0200)
Subject: Renamed GameManager::start_game() to GameManager::start_worldmap()
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a5573c34ca389a227ae5cf62f12c105fb6676a54;p=supertux.git

Renamed GameManager::start_game() to GameManager::start_worldmap()
---

diff --git a/src/supertux/game_manager.cpp b/src/supertux/game_manager.cpp
index c3ca5a1fd..2546e9476 100644
--- a/src/supertux/game_manager.cpp
+++ b/src/supertux/game_manager.cpp
@@ -56,7 +56,7 @@ GameManager::start_level(std::unique_ptr<World> world, const std::string& level_
 }
 
 void
-GameManager::start_game(std::unique_ptr<World> world)
+GameManager::start_worldmap(std::unique_ptr<World> world)
 {
   try
   {
diff --git a/src/supertux/game_manager.hpp b/src/supertux/game_manager.hpp
index d5a9b3991..7a66b0ee2 100644
--- a/src/supertux/game_manager.hpp
+++ b/src/supertux/game_manager.hpp
@@ -34,7 +34,7 @@ public:
   GameManager();
   ~GameManager();
 
-  void start_game(std::unique_ptr<World> world);
+  void start_worldmap(std::unique_ptr<World> world);
   void start_level(std::unique_ptr<World> world, const std::string& level_filename);
 
   std::string get_level_name(const std::string& levelfile) const;
diff --git a/src/supertux/menu/contrib_menu.cpp b/src/supertux/menu/contrib_menu.cpp
index f2536ac6e..d4ae7673f 100644
--- a/src/supertux/menu/contrib_menu.cpp
+++ b/src/supertux/menu/contrib_menu.cpp
@@ -144,7 +144,7 @@ ContribMenu::check_menu()
     std::unique_ptr<World> world = World::load(m_contrib_worlds[index]->get_basedir());
     if (!world->is_levelset())
     {
-      GameManager::current()->start_game(std::move(world));
+      GameManager::current()->start_worldmap(std::move(world));
     }
     else
     {
diff --git a/src/supertux/menu/main_menu.cpp b/src/supertux/menu/main_menu.cpp
index dd4195a3c..a93ff541a 100644
--- a/src/supertux/menu/main_menu.cpp
+++ b/src/supertux/menu/main_menu.cpp
@@ -58,7 +58,7 @@ MainMenu::check_menu()
     case MNID_STARTGAME:
       {
         std::unique_ptr<World> world = World::load("levels/world1");
-        GameManager::current()->start_game(std::move(world));
+        GameManager::current()->start_worldmap(std::move(world));
       }
       break;