-// $Id: level_subset.cpp 3118 2006-03-25 17:29:08Z sommer $
-//
+// $Id$
+//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// 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, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
#include "physfs/physfs_stream.hpp"
-#include "script_manager.hpp"
-#include "scripting/wrapper_util.hpp"
+#include "scripting/squirrel_util.hpp"
#include "scripting/serialize.hpp"
#include "log.hpp"
-#include "worldmap.hpp"
+#include "worldmap/worldmap.hpp"
#include "mainloop.hpp"
static bool has_suffix(const std::string& data, const std::string& suffix)
{
is_levelset = true;
hide_from_contribs = false;
+ sq_resetobject(&world_thread);
}
World::~World()
{
+ sq_release(Scripting::global_vm, &world_thread);
if(current_ == this)
current_ = NULL;
}
throw std::runtime_error(msg.str());
}
}
-
+
if(!PHYSFS_isDirectory(dirname.c_str())) {
std::ostringstream msg;
msg << "Savegame path '" << dirname << "' is not a directory";
World::load(const std::string& filename)
{
basedir = FileSystem::dirname(filename);
-
+
lisp::Parser parser;
std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
// Level info file doesn't define any levels, so read the
// directory to see what we can find
-
- std::string path = basedir + "/";
+
+ std::string path = basedir;
char** files = PHYSFS_enumerateFiles(path.c_str());
if(!files) {
log_warning << "Couldn't read subset dir '" << path << "'" << std::endl;
void
World::run()
{
+ using namespace Scripting;
+
current_ = this;
-
+
// create new squirrel table for persisten game state
- HSQUIRRELVM vm = ScriptManager::instance->get_vm();
+ HSQUIRRELVM vm = Scripting::global_vm;
sq_pushroottable(vm);
sq_pushstring(vm, "state", -1);
sq_pop(vm, 1);
load_state();
-
+
std::string filename = basedir + "/world.nut";
try {
IFileStream in(filename);
- HSQUIRRELVM new_vm = ScriptManager::instance->create_thread();
- Scripting::compile_and_run(new_vm, in, filename);
- } catch(std::exception& e) {
+ sq_release(global_vm, &world_thread);
+ world_thread = create_thread(global_vm);
+ compile_and_run(object_to_vm(world_thread), in, filename);
+ } catch(std::exception& ) {
+ // fallback: try to load worldmap worldmap.stwm
using namespace WorldMapNS;
- // fallback try to load worldmap
- std::auto_ptr<WorldMap> worldmap (new WorldMap);
- worldmap->loadmap(basedir + "worldmap.stwm");
- main_loop->push_screen(worldmap.release());
+ main_loop->push_screen(new WorldMap(basedir + "worldmap.stwm"));
}
}
void
World::save_state()
{
+ using namespace Scripting;
+
lisp::Writer writer(savegame_filename);
writer.start_list("supertux-savegame");
writer.write_int("version", 1);
-
+
using namespace WorldMapNS;
if(WorldMap::current() != NULL) {
std::ostringstream title;
title << WorldMap::current()->get_title();
- title << " (" << WorldMap::current()->solved_level_count()
+ title << " (" << WorldMap::current()->solved_level_count()
<< "/" << WorldMap::current()->level_count() << ")";
writer.write_string("title", title.str());
}
writer.end_list("tux");
writer.start_list("state");
- HSQUIRRELVM vm = ScriptManager::instance->get_vm();
- sq_pushroottable(vm);
- sq_pushstring(vm, "state", -1);
- if(SQ_SUCCEEDED(sq_get(vm, -2))) {
- Scripting::save_squirrel_table(vm, -1, writer);
- sq_pop(vm, 1);
+
+ sq_pushroottable(global_vm);
+ sq_pushstring(global_vm, "state", -1);
+ if(SQ_SUCCEEDED(sq_get(global_vm, -2))) {
+ Scripting::save_squirrel_table(global_vm, -1, writer);
+ sq_pop(global_vm, 1);
}
- sq_pop(vm, 1);
+ sq_pop(global_vm, 1);
writer.end_list("state");
-
+
writer.end_list("supertux-savegame");
}
void
World::load_state()
{
+ using namespace Scripting;
+
try {
lisp::Parser parser;
std::auto_ptr<lisp::Lisp> root (parser.parse(savegame_filename));
const lisp::Lisp* state = lisp->get_lisp("state");
if(state == NULL)
throw std::runtime_error("No state section in savegame");
-
- HSQUIRRELVM vm = ScriptManager::instance->get_vm();
- sq_pushroottable(vm);
- sq_pushstring(vm, "state", -1);
- if(SQ_FAILED(sq_deleteslot(vm, -2, SQFalse)))
- sq_pop(vm, 1);
-
- sq_pushstring(vm, "state", -1);
- sq_newtable(vm);
- Scripting::load_squirrel_table(vm, -1, state);
- if(SQ_FAILED(sq_createslot(vm, -3)))
+
+ sq_pushroottable(global_vm);
+ sq_pushstring(global_vm, "state", -1);
+ if(SQ_FAILED(sq_deleteslot(global_vm, -2, SQFalse)))
+ sq_pop(global_vm, 1);
+
+ sq_pushstring(global_vm, "state", -1);
+ sq_newtable(global_vm);
+ load_squirrel_table(global_vm, -1, state);
+ if(SQ_FAILED(sq_createslot(global_vm, -3)))
throw std::runtime_error("Couldn't create state table");
- sq_pop(vm, 1);
+ sq_pop(global_vm, 1);
} catch(std::exception& e) {
log_debug << "Couldn't load savegame: " << e.what() << std::endl;
}