- Avoid some expensive SDL_GetTicks() calls

[supertux.git] / src / console.cpp

diff --git a/src/console.cpp b/src/console.cpp
index 2867c9e..1b5f01e 100644 (file)
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -1,4 +1,4 @@
-//  $Id: worldmap.cpp 3209 2006-04-02 22:19:22Z sommer $
+//  $Id$
 //
 //  SuperTux - Console
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@ -23,27 +23,38 @@
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
 #include "scripting/squirrel_error.hpp"
-#include "scripting/wrapper_util.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "physfs/physfs_stream.hpp"
 #include "player_status.hpp"
-#include "script_manager.hpp"
 #include "main.hpp"
+#include "log.hpp"
 #include "resources.hpp"
 
 /// speed (pixels/s) the console closes
 static const float FADE_SPEED = 1;
 
 Console::Console()
-  : backgroundOffset(0), height(0), alpha(1.0), offset(0), focused(false),
-    stayOpen(0)
+  : vm(NULL), backgroundOffset(0), height(0), alpha(1.0), offset(0),
+    focused(false), stayOpen(0)
 {
-  font.reset(new Font("images/engine/fonts/white-small.png",
-                      "images/engine/fonts/shadow-small.png", 8, 9, 1));
-  background.reset(new Surface("images/engine/console.png"));
-  background2.reset(new Surface("images/engine/console2.png"));
+  fontheight = 8;
 }
 
 Console::~Console() 
 {
+  if(vm != NULL) {
+    sq_release(Scripting::global_vm, &vm_object);
+  }
+}
+
+void
+Console::init_graphics()
+{
+  font.reset(new Font("images/engine/fonts/white-small.png",
+                      "images/engine/fonts/shadow-small.png", 8, 9, 1));
+  fontheight = font->get_height();
+  background.reset(new Surface("images/engine/console.png"));
+  background2.reset(new Surface("images/engine/console2.png"));
 }
 
 void 
@@ -73,19 +84,46 @@ Console::execute_script(const std::string& command)
 {
   using namespace Scripting;
 
-  HSQUIRRELVM vm = ScriptManager::instance->get_vm();
-
-  if(command == "")
-    return;
-  
+  if(vm == NULL) {
+    vm = Scripting::global_vm;
+    HSQUIRRELVM new_vm = sq_newthread(vm, 16);
+    if(new_vm == NULL)
+      throw Scripting::SquirrelError(vm, "Couldn't create new VM thread for console");
+
+    // store reference to thread
+    sq_resetobject(&vm_object);
+    if(SQ_FAILED(sq_getstackobj(vm, -1, &vm_object)))
+      throw Scripting::SquirrelError(vm, "Couldn't get vm object for console");
+    sq_addref(vm, &vm_object);
+    sq_pop(vm, 1);
+    
+    // create new roottable for thread
+    sq_newtable(new_vm);
+    sq_pushroottable(new_vm);
+    if(SQ_FAILED(sq_setdelegate(new_vm, -2)))
+      throw Scripting::SquirrelError(new_vm, "Couldn't set console_table delegate");
+
+    sq_setroottable(new_vm);
+
+    vm = new_vm;
+    
+    try {
+      std::string filename = "scripts/console.nut";
+      IFileStream stream(filename);
+      Scripting::compile_and_run(vm, stream, filename);
+    } catch(std::exception& e) {
+      log_warning << "Couldn't load console.nut: " << e.what() << std::endl;
+    }
+  }
+    
   int oldtop = sq_gettop(vm); 
   try {
     if(SQ_FAILED(sq_compilebuffer(vm, command.c_str(), command.length(),
                  "", SQTrue)))
       throw SquirrelError(vm, "Couldn't compile command");
 
-    sq_pushroottable(vm);
-    if(SQ_FAILED(sq_call(vm, 1, SQTrue)))
+    sq_pushroottable(vm); 
+    if(SQ_FAILED(sq_call(vm, 1, SQTrue, SQTrue)))
       throw SquirrelError(vm, "Problem while executing command");
 
     if(sq_gettype(vm, -1) != OT_NULL)
@@ -159,12 +197,12 @@ Console::addLine(std::string s)
   if (height < 64) {
     if(height < 4)
       height = 4;
-    height += font->get_height();
+    height += fontheight;
   }
 
   alpha = 1.0;
-  if(stayOpen < 5)
-    stayOpen += 1;
+  if(stayOpen < 6)
+    stayOpen += 1.5;
 }
 
 void