Messaging subsystem rewrite, step I

[supertux.git] / src / worldmap.cpp

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index d1ba816..b4b6f1f 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -151,7 +151,7 @@ Tux::draw(DrawingContext& context)
       tux_sprite->set_action(moving ? "small-walking" : "small-stop");
       break;
     default:
-      msg_debug("Bonus type not handled in worldmap.");
+      msg_debug << "Bonus type not handled in worldmap." << std::endl;
       tux_sprite->set_action("large-stop");
       break;
   }
@@ -296,7 +296,7 @@ Tux::tryContinueWalking(float elapsed_time)
     if (dir == D_NONE) 
     {
       // Should never be reached if tiledata is good
-      msg_warning("Could not determine where to walk next");
+      msg_warning << "Could not determine where to walk next" << std::endl;
       stop();
       return;
     }
@@ -316,7 +316,7 @@ Tux::tryContinueWalking(float elapsed_time)
     }
     else
     {
-      msg_warning("Tilemap data is buggy");
+      msg_warning << "Tilemap data is buggy" << std::endl;
       stop();
     }
   }
@@ -444,7 +444,7 @@ WorldMap::load_map()
       } else if(iter.item() == "name") {
         // skip
       } else {
-        msg_warning("Unknown token '" << iter.item() << "' in worldmap");
+        msg_warning << "Unknown token '" << iter.item() << "' in worldmap" << std::endl;
       }
     }
     if(solids == 0)
@@ -547,8 +547,7 @@ WorldMap::parse_level_tile(const lisp::Lisp* level_lisp)
        // Do we want to bail out instead...? We might get messages from modders
        // who can't make their levels run because they're too dumb to watch
        // their terminals...
-    msg_warning("level file '" << level.name
-      << "' does not exist and will not be added to the worldmap");
+    msg_warning << "level file '" << level.name << "' does not exist and will not be added to the worldmap" << std::endl;
     return;
   }
 
@@ -580,7 +579,7 @@ WorldMap::get_level_title(Level& level)
     
     level_lisp->get("name", level.title);
   } catch(std::exception& e) {
-    msg_warning("Problem when reading leveltitle: " << e.what());
+    msg_warning << "Problem when reading leveltitle: " << e.what() << std::endl;
     return;
   }
 }
@@ -734,7 +733,7 @@ WorldMap::finished_level(const std::string& filename)
       interpreter->run_script(in, "level-extro-script");
       add_object(interpreter.release());
     } catch(std::exception& e) {
-      msg_fatal("Couldn't run level-extro-script:" << e.what());
+      msg_fatal << "Couldn't run level-extro-script:" << e.what() << std::endl;
     }
   }
   
@@ -833,8 +832,7 @@ WorldMap::update(float delta)
       /* Check level action */
       Level* level = at_level();
       if (!level) {
-        msg_warning("No level to enter at: "
-            << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y);
+        msg_warning << "No level to enter at: " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
         return;
       }
 
@@ -849,7 +847,7 @@ WorldMap::update(float delta)
                 ST_GL_LOAD_LEVEL_FILE, &level->statistics);
           main_loop->push_screen(session);
         } catch(std::exception& e) {
-          msg_fatal("Couldn't load level: " << e.what());
+          msg_fatal << "Couldn't load level: " << e.what() << std::endl;
         }
       }
     }
@@ -1060,7 +1058,7 @@ WorldMap::savegame(const std::string& filename)
 void
 WorldMap::loadgame(const std::string& filename)
 {
-  msg_debug("loadgame: " << filename);
+  msg_debug << "loadgame: " << filename << std::endl;
   savegame_file = filename;
   
   if (PHYSFS_exists(filename.c_str())) // savegame exists
@@ -1119,13 +1117,12 @@ WorldMap::loadgame(const std::string& filename)
               }
             }
           } else {
-            msg_warning("Unknown token '" << iter.item() 
-                      << "' in levels block in worldmap");
+            msg_warning << "Unknown token '" << iter.item() << "' in levels block in worldmap" << std::endl;
           }
         }
       }
     } catch(std::exception& e) {
-      msg_warning("Problem loading game '" << filename << "': " << e.what());
+      msg_warning << "Problem loading game '" << filename << "': " << e.what() << std::endl;
       load_map();
       player_status->reset();
     }