X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Ftime_scheduler.cpp;h=2396d56613c2f852465beddabb78bd3d4159aab7;hb=051da28245f26cb1a073c764de235460e87ec64f;hp=8310abcd524935fac292aae4441eaea5d8e9fb83;hpb=c62711567861587107d124642db29e2674ee6533;p=supertux.git

diff --git a/src/scripting/time_scheduler.cpp b/src/scripting/time_scheduler.cpp
index 8310abcd5..2396d5661 100644
--- a/src/scripting/time_scheduler.cpp
+++ b/src/scripting/time_scheduler.cpp
@@ -1,4 +1,4 @@
-//  $Id: script_manager.hpp 3379 2006-04-20 18:44:10Z matzebraun $
+//  $Id$
 //
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
@@ -51,9 +51,9 @@ TimeScheduler::update(float time)
     HSQUIRRELVM scheduled_vm;
     if(sq_gettype(global_vm, -1) == OT_THREAD &&
         SQ_SUCCEEDED(sq_getthread(global_vm, -1, &scheduled_vm))) {
-      if(SQ_FAILED(sq_wakeupvm(scheduled_vm, SQFalse, SQFalse, SQTrue))) {
+      if(SQ_FAILED(sq_wakeupvm(scheduled_vm, SQFalse, SQFalse, SQTrue, SQFalse))) {
         std::ostringstream msg;
-        msg << "Couldn't wakeup scheduled squirrel VM: ";
+        msg << "Error waking VM: ";
         sq_getlasterror(scheduled_vm);
         if(sq_gettype(scheduled_vm, -1) != OT_STRING) {
             msg << "(no info)";
@@ -70,7 +70,7 @@ TimeScheduler::update(float time)
     sq_release(global_vm, &thread_ref);
     sq_pop(global_vm, 2);
 
-    pop_heap(schedule.begin(), schedule.end());
+    std::pop_heap(schedule.begin(), schedule.end());
     schedule.pop_back();
   }
 }
@@ -98,4 +98,3 @@ TimeScheduler::schedule_thread(HSQUIRRELVM scheduled_vm, float time)
 }
 
 }
-