-// $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>
#include "video/surface.hpp"
#include "scripting/squirrel_error.hpp"
#include "scripting/wrapper_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));
Console::~Console()
{
+ if(vm != NULL) {
+ sq_release(ScriptManager::instance->get_vm(), &vm_object);
+ }
}
void
{
using namespace Scripting;
- HSQUIRRELVM vm = ScriptManager::instance->get_vm();
-
- if(command == "")
- return;
-
+ if(vm == NULL) {
+ vm = ScriptManager::instance->get_vm();
+ HSQUIRRELVM new_vm = sq_newthread(vm, 16);
+ if(new_vm == NULL)
+ throw Scripting::SquirrelError(ScriptManager::instance->get_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);
+ sq_pushroottable(vm);
if(SQ_FAILED(sq_call(vm, 1, SQTrue)))
throw SquirrelError(vm, "Problem while executing command");
}
alpha = 1.0;
- if(stayOpen < 5)
- stayOpen += 1;
+ if(stayOpen < 6)
+ stayOpen += 1.5;
}
void
if (height == 0)
return;
+ int layer = LAYER_GUI + 1;
+
context.push_transform();
context.set_alpha(alpha);
- context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 - background->get_width() + backgroundOffset, height - background->get_height()), LAYER_FOREGROUND1+1);
- context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 + backgroundOffset, height - background->get_height()), LAYER_FOREGROUND1+1);
- context.draw_surface(background.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2, height - background->get_height()), LAYER_FOREGROUND1+1);
+ context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 - background->get_width() + backgroundOffset, height - background->get_height()), layer);
+ context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 + backgroundOffset, height - background->get_height()), layer);
+ context.draw_surface(background.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2, height - background->get_height()), layer);
backgroundOffset+=10;
if (backgroundOffset > (int)background->get_width()) backgroundOffset -= (int)background->get_width();
if (focused) {
lineNo++;
float py = height-4-1*9;
- context.draw_text(font.get(), "> "+inputBuffer.str()+"_", Vector(4, py), LEFT_ALLIGN, LAYER_FOREGROUND1+1);
+ context.draw_text(font.get(), "> "+inputBuffer.str()+"_", Vector(4, py), LEFT_ALLIGN, layer);
}
int skipLines = -offset;
lineNo++;
float py = height-4-lineNo*9;
if (py < -9) break;
- context.draw_text(font.get(), *i, Vector(4, py), LEFT_ALLIGN, LAYER_FOREGROUND1+1);
+ context.draw_text(font.get(), *i, Vector(4, py), LEFT_ALLIGN, layer);
}
context.pop_transform();