Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/scripting/thread_queue.cpp b/src/scripting/thread_queue.cpp
index 2d20e47..4e3d06c 100644 (file)
--- a/src/scripting/thread_queue.cpp
+++ b/src/scripting/thread_queue.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  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 2
-//  of the License, or (at your option) any later version.
+//  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
@@ -14,13 +12,12 @@
 //  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  02111-1307, USA.
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "scripting/thread_queue.hpp"
 
-#include "thread_queue.hpp"
-#include "squirrel_util.hpp"
-#include "log.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "util/log.hpp"
 
 namespace Scripting
 {
@@ -69,7 +66,7 @@ ThreadQueue::wakeup()
 
     HSQUIRRELVM scheduled_vm;
     if(sq_gettype(global_vm, -1) == OT_THREAD &&
-            SQ_SUCCEEDED(sq_getthread(global_vm, -1, &scheduled_vm))) {
+       SQ_SUCCEEDED(sq_getthread(global_vm, -1, &scheduled_vm))) {
       if(SQ_FAILED(sq_wakeupvm(scheduled_vm, SQFalse, SQFalse, SQTrue, SQFalse))) {
         log_warning << "Couldn't wakeup scheduled squirrel VM" << std::endl;
       }
@@ -84,3 +81,5 @@ ThreadQueue::wakeup()
 }
 
 }
+
+/* EOF */