From 05d168f5e5bbd46e44b1b1ad857d2d8c59b230c1 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sat, 28 Feb 2015 10:50:53 +0100 Subject: [PATCH] Replace sq_newslot with sq_createslot where appropriate (shorter and does the same thing) [ci skip] --- src/supertux/savegame.cpp | 4 ++-- src/worldmap/worldmap.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/supertux/savegame.cpp b/src/supertux/savegame.cpp index b181901a3..f6f456a03 100644 --- a/src/supertux/savegame.cpp +++ b/src/supertux/savegame.cpp @@ -53,7 +53,7 @@ void get_or_create_table_entry(HSQUIRRELVM vm, const std::string& name) { sq_pushstring(vm, name.c_str(), -1); sq_newtable(vm); - if(SQ_FAILED(sq_newslot(vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(vm, -3))) { throw std::runtime_error("failed to create '" + name + "' table entry"); } @@ -261,7 +261,7 @@ Savegame::clear_state_table() // create a new empty state table sq_pushstring(vm, "state", -1); sq_newtable(vm); - if(SQ_FAILED(sq_newslot(vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(vm, -3))) { throw std::runtime_error("Couldn't create state table"); } diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp index f6be69f31..36159059a 100644 --- a/src/worldmap/worldmap.cpp +++ b/src/worldmap/worldmap.cpp @@ -928,7 +928,7 @@ WorldMap::setup() sq_pushroottable(global_vm); sq_pushstring(global_vm, "worldmap", -1); sq_pushobject(global_vm, worldmap_table); - if(SQ_FAILED(sq_newslot(global_vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(global_vm, -3))) throw SquirrelError(global_vm, "Couldn't set worldmap in roottable"); sq_pop(global_vm, 1); @@ -993,7 +993,7 @@ WorldMap::save_state() if(SQ_FAILED(sq_get(vm, -2))) { sq_pushstring(vm, "worlds", -1); sq_newtable(vm); - if(SQ_FAILED(sq_newslot(vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(vm, -3))) throw scripting::SquirrelError(vm, "Couldn't create state.worlds"); sq_pushstring(vm, "worlds", -1); @@ -1018,7 +1018,7 @@ WorldMap::save_state() store_float(vm, "y", tux->get_tile_pos().y); store_string(vm, "back", direction_to_string(tux->back_direction)); - sq_newslot(vm, -3, SQFalse); + sq_createslot(vm, -3); // levels... sq_pushstring(vm, "levels", -1); @@ -1034,13 +1034,13 @@ WorldMap::save_state() store_bool(vm, "perfect", level->perfect); level->statistics.serialize_to_squirrel(vm); - if(SQ_FAILED(sq_newslot(vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(vm, -3))) { throw std::runtime_error("failed to create '" + name + "' table entry"); } } - if(SQ_FAILED(sq_newslot(vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(vm, -3))) { throw std::runtime_error("failed to create '" + name + "' table entry"); } @@ -1049,7 +1049,7 @@ WorldMap::save_state() total_stats.serialize_to_squirrel(vm); // push world into worlds table - if(SQ_FAILED(sq_newslot(vm, -3, SQFalse))) + if(SQ_FAILED(sq_createslot(vm, -3))) { throw std::runtime_error("failed to create '" + name + "' table entry"); } -- 2.11.0