New sound effects

[supertux.git] / src / scripting / squirrel_error.cpp

diff --git a/src/scripting/squirrel_error.cpp b/src/scripting/squirrel_error.cpp
index c6bcc73..d3445cc 100644 (file)
--- a/src/scripting/squirrel_error.cpp
+++ b/src/scripting/squirrel_error.cpp
@@ -1,15 +1,29 @@
-#include <config.h>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  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, see <http://www.gnu.org/licenses/>.
 
-#include "squirrel_error.hpp"
+#include "scripting/squirrel_error.hpp"
 #include <sstream>
 
-namespace Scripting
-{
+namespace scripting {
 
-SquirrelError::SquirrelError(HSQUIRRELVM v, const std::string& message) throw()
+SquirrelError::SquirrelError(HSQUIRRELVM v, const std::string& message_) throw() :
+  message()
 {
   std::ostringstream msg;
-  msg << "Squirrel error: " << message << " (";
+  msg << "Squirrel error: " << message_ << " (";
   const char* lasterr;
   sq_getlasterror(v);
   if(sq_gettype(v, -1) != OT_STRING)
@@ -20,8 +34,8 @@ SquirrelError::SquirrelError(HSQUIRRELVM v, const std::string& message) throw()
   {
     sq_getstring(v, -1, &lasterr);
   }
-  sq_pop(v, 1);
   msg << lasterr << ")";
+  sq_pop(v, 1);
   this->message = msg.str();
 }
 
@@ -35,3 +49,5 @@ SquirrelError::what() const throw()
 }
 
 }
+
+/* EOF */