New grow and skid sounds from remaxim

[supertux.git] / src / log.hpp

diff --git a/src/log.hpp b/src/log.hpp
index c666df3..9b29518 100644 (file)
--- a/src/log.hpp
+++ b/src/log.hpp
@@ -1,5 +1,5 @@
-//  $Id: debug.cpp 2650 2005-06-28 12:42:08Z sommer $
-// 
+//  $Id$
+//
 //  SuperTux Debug Helper Functions
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  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
@@ -30,22 +30,22 @@
 namespace {
 
 inline std::ostream& log_debug_f(const char* file, int line) {
-  Console::output << "[DEBUG] " << file << " l." << line << ": ";
+  Console::output << "[DEBUG] " << file << ":" << line << " ";
   return Console::output;
 }
 
 inline std::ostream& log_info_f(const char* file, int line) {
-  Console::output << "[INFO] " << file << " l." << line << ": ";
+  Console::output << "[INFO] " << file << ":" << line << " ";
   return Console::output;
 }
 
 inline std::ostream& log_warning_f(const char* file, int line) {
-  Console::output << "[WARNING] " << file << " l." << line << ": ";
+  Console::output << "[WARNING] " << file << ":" << line << " ";
   return Console::output;
 }
 
 inline std::ostream& log_fatal_f(const char* file, int line) {
-  Console::output << "[FATAL] " << file << " l." << line << ": ";
+  Console::output << "[FATAL] " << file << ":" << line << " ";
   return Console::output;
 }
 
@@ -60,11 +60,6 @@ inline std::ostream& log_fatal_f(const char* file, int line) {
 
 namespace {
 
-inline std::ostream& log_warning_f() {
-  Console::output << "Warning: ";
-  return Console::output;
-}
-
 inline std::ostream& log_fatal_f() {
   Console::output << "Fatal: ";
   return Console::output;
@@ -73,11 +68,15 @@ inline std::ostream& log_fatal_f() {
 }
 
 #define log_debug if (0) std::cerr
-#define log_info Console::output
-#define log_warning log_warning_f()
+#define log_info std::cout
+#define log_warning std::cerr
 #define log_fatal log_fatal_f()
 
 #endif
 
-#endif
+class Vector;
+std::ostream& operator<< (std::ostream& str, const Vector& vector);
+class Rect;
+std::ostream& operator<< (std::ostream& str, const Rect& rect);
 
+#endif