X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=295c57dbb1f05a938beb7387487ec962dfa874a9;hb=f53572ad2b744ddddd7cc4b6479489543d44f98d;hp=d0c4a95910e418e56ba8381b9b473f648eb247fa;hpb=4189df43ee4424cbbf1fbd33119ce8a1d4a8e1a2;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index d0c4a9591..295c57dbb 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -1,7 +1,7 @@ // $Id$ // // SuperTux - A Jump'n Run -// Copyright (C) 2004 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -60,15 +60,17 @@ #include "badguy/jumpy.hpp" #include "trigger/sequence_trigger.hpp" #include "player_status.hpp" -#include "script_manager.hpp" -#include "scripting/wrapper_util.hpp" +#include "scripting/squirrel_util.hpp" #include "script_interface.hpp" -#include "msg.hpp" +#include "log.hpp" Sector* Sector::_current = 0; -Sector::Sector() - : currentmusic(LEVEL_MUSIC), gravity(10), +bool Sector::show_collrects = false; +bool Sector::draw_solids_only = false; + +Sector::Sector(Level* parent) + : level(parent), currentmusic(LEVEL_MUSIC), gravity(10), player(0), solids(0), camera(0) { add_object(new Player(player_status)); @@ -79,37 +81,45 @@ Sector::Sector() grid.reset(new CollisionGrid(32000, 32000)); #endif - script_manager.reset(new ScriptManager(ScriptManager::instance)); - // create a new squirrel table for the sector - HSQUIRRELVM vm = ScriptManager::instance->get_vm(); - - sq_newtable(vm); - sq_pushroottable(vm); - if(SQ_FAILED(sq_setdelegate(vm, -2))) - throw Scripting::SquirrelError(vm, "Couldn't set sector_table delegate"); + using namespace Scripting; + + sq_collectgarbage(global_vm); + + sq_newtable(global_vm); + sq_pushroottable(global_vm); + if(SQ_FAILED(sq_setdelegate(global_vm, -2))) + throw Scripting::SquirrelError(global_vm, "Couldn't set sector_table delegate"); sq_resetobject(§or_table); - if(SQ_FAILED(sq_getstackobj(vm, -1, §or_table))) - throw Scripting::SquirrelError(vm, "Couldn't get sector table"); - sq_addref(vm, §or_table); - sq_pop(vm, 1); + if(SQ_FAILED(sq_getstackobj(global_vm, -1, §or_table))) + throw Scripting::SquirrelError(global_vm, "Couldn't get sector table"); + sq_addref(global_vm, §or_table); + sq_pop(global_vm, 1); } Sector::~Sector() { - deactivate(); + using namespace Scripting; - script_manager.reset(NULL); - sq_release(ScriptManager::instance->get_vm(), §or_table); + deactivate(); + + for(ScriptList::iterator i = scripts.begin(); + i != scripts.end(); ++i) { + HSQOBJECT& object = *i; + sq_release(global_vm, &object); + } + sq_release(global_vm, §or_table); + sq_collectgarbage(global_vm); update_game_objects(); assert(gameobjects_new.size() == 0); - for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); - ++i) { - before_object_remove(*i); - delete *i; + for(GameObjects::iterator i = gameobjects.begin(); + i != gameobjects.end(); ++i) { + GameObject* object = *i; + before_object_remove(object); + object->unref(); } for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end(); @@ -117,6 +127,12 @@ Sector::~Sector() delete *i; } +Level* +Sector::get_level() +{ + return level; +} + GameObject* Sector::parse_object(const std::string& name, const lisp::Lisp& reader) { @@ -151,7 +167,7 @@ Sector::parse_object(const std::string& name, const lisp::Lisp& reader) try { return create_object(name, reader); } catch(std::exception& e) { - msg_warning << e.what() << "" << std::endl; + log_warning << e.what() << "" << std::endl; } return 0; @@ -189,7 +205,7 @@ Sector::parse(const lisp::Lisp& sector) fix_old_tiles(); if(!camera) { - msg_warning << "sector '" << name << "' does not contain a camera." << std::endl; + log_warning << "sector '" << name << "' does not contain a camera." << std::endl; update_game_objects(); add_object(new Camera(this)); } @@ -297,7 +313,7 @@ Sector::parse_old_format(const lisp::Lisp& reader) spawnpoints.push_back(sp); } } else { - msg_warning << "Unknown token '" << iter.item() << "' in reset-points." << std::endl; + log_warning << "Unknown token '" << iter.item() << "' in reset-points." << std::endl; } } } @@ -311,7 +327,7 @@ Sector::parse_old_format(const lisp::Lisp& reader) if(object) { add_object(object); } else { - msg_warning << "Unknown object '" << iter.item() << "' in level." << std::endl; + log_warning << "Unknown object '" << iter.item() << "' in level." << std::endl; } } } @@ -389,14 +405,33 @@ Sector::write(lisp::Writer& writer) HSQUIRRELVM Sector::run_script(std::istream& in, const std::string& sourcename) { - // create new thread and keep a weakref - HSQUIRRELVM vm = script_manager->create_thread(); + using namespace Scripting; + + // garbage collect thread list + for(ScriptList::iterator i = scripts.begin(); + i != scripts.end(); ) { + HSQOBJECT& object = *i; + HSQUIRRELVM vm = object_to_vm(object); + + if(sq_getvmstate(vm) != SQ_VMSTATE_SUSPENDED) { + sq_release(global_vm, &object); + i = scripts.erase(i); + continue; + } + + ++i; + } + + HSQOBJECT object = create_thread(global_vm); + scripts.push_back(object); + + HSQUIRRELVM vm = object_to_vm(object); // set sector_table as roottable for the thread sq_pushobject(vm, sector_table); sq_setroottable(vm); - Scripting::compile_and_run(vm, in, sourcename); + compile_and_run(vm, in, sourcename); return vm; } @@ -420,6 +455,7 @@ Sector::add_object(GameObject* object) } #endif + object->ref(); gameobjects_new.push_back(object); } @@ -435,7 +471,7 @@ Sector::activate(const std::string& spawnpoint) } } if(!sp) { - msg_warning << "Spawnpoint '" << spawnpoint << "' not found." << std::endl; + log_warning << "Spawnpoint '" << spawnpoint << "' not found." << std::endl; if(spawnpoint != "main") { activate("main"); } else { @@ -454,8 +490,8 @@ Sector::activate(const Vector& player_pos) _current->deactivate(); _current = this; - // register sectortable as current_sector in scripting - HSQUIRRELVM vm = ScriptManager::instance->get_vm(); + // register sectortable as sector in scripting + HSQUIRRELVM vm = Scripting::global_vm; sq_pushroottable(vm); sq_pushstring(vm, "sector", -1); sq_pushobject(vm, sector_table); @@ -473,6 +509,7 @@ Sector::activate(const Vector& player_pos) player->move(player_pos); camera->reset(player->get_pos()); + update_game_objects(); // Run init script if(init_script != "") { @@ -488,7 +525,7 @@ Sector::deactivate() return; // remove sector entry from global vm - HSQUIRRELVM vm = ScriptManager::instance->get_vm(); + HSQUIRRELVM vm = Scripting::global_vm; sq_pushroottable(vm); sq_pushstring(vm, "sector", -1); if(SQ_FAILED(sq_deleteslot(vm, -2, SQFalse))) @@ -516,8 +553,6 @@ Sector::get_active_region() void Sector::update(float elapsed_time) { - script_manager->update(); - player->check_bounds(camera); #if 0 @@ -584,7 +619,7 @@ Sector::update_game_objects() before_object_remove(object); - delete *i; + object->unref(); i = gameobjects.erase(i); } @@ -621,14 +656,14 @@ Sector::before_object_add(GameObject* object) if(solids == 0) { solids = tilemap; } else { - msg_warning << "Another solid tilemaps added. Ignoring" << std::endl; + log_warning << "Another solid tilemaps added. Ignoring" << std::endl; } } Camera* camera = dynamic_cast (object); if(camera) { if(this->camera != 0) { - msg_warning << "Multiple cameras added. Ignoring" << std::endl; + log_warning << "Multiple cameras added. Ignoring" << std::endl; return false; } this->camera = camera; @@ -637,7 +672,7 @@ Sector::before_object_add(GameObject* object) Player* player = dynamic_cast (object); if(player) { if(this->player != 0) { - msg_warning << "Multiple players added. Ignoring" << std::endl; + log_warning << "Multiple players added. Ignoring" << std::endl; return false; } this->player = player; @@ -655,7 +690,7 @@ Sector::try_expose(GameObject* object) { ScriptInterface* interface = dynamic_cast (object); if(interface != NULL) { - HSQUIRRELVM vm = script_manager->get_vm(); + HSQUIRRELVM vm = Scripting::global_vm; sq_pushobject(vm, sector_table); interface->expose(vm, -1); sq_pop(vm, 1); @@ -674,10 +709,15 @@ Sector::try_unexpose(GameObject* object) { ScriptInterface* interface = dynamic_cast (object); if(interface != NULL) { - HSQUIRRELVM vm = script_manager->get_vm(); + HSQUIRRELVM vm = Scripting::global_vm; + int oldtop = sq_gettop(vm); sq_pushobject(vm, sector_table); - interface->unexpose(vm, -1); - sq_pop(vm, 1); + try { + interface->unexpose(vm, -1); + } catch(std::exception& e) { + log_warning << "Couldn't unregister object: " << e.what() << std::endl; + } + sq_settop(vm, oldtop); } } @@ -692,10 +732,28 @@ Sector::draw(DrawingContext& context) GameObject* object = *i; if(!object->is_valid()) continue; - + + if (draw_solids_only) + { + TileMap* tm = dynamic_cast(object); + if (tm && !tm->is_solid()) + continue; + } + object->draw(context); } + if(show_collrects) { + Color col(0.2, 0.2, 0.2, 0.7); + for(MovingObjects::iterator i = moving_objects.begin(); + i != moving_objects.end(); ++i) { + MovingObject* object = *i; + const Rect& rect = object->get_bbox(); + + context.draw_filled_rect(rect, col, LAYER_FOREGROUND1 + 10); + } + } + context.pop_transform(); } @@ -1032,8 +1090,8 @@ Sector::is_free_space(const Rect& rect) const int max_x = int(rect.p2.x); int max_y = int(rect.p2.y); - for(int x = starttilex; x*32 < max_x; ++x) { - for(int y = starttiley; y*32 < max_y; ++y) { + for(int x = starttilex; x*32 <= max_x; ++x) { + for(int y = starttiley; y*32 <= max_y; ++y) { const Tile* tile = solids->get_tile(x, y); if(!tile) continue; @@ -1060,16 +1118,14 @@ bool Sector::add_bullet(const Vector& pos, float xm, Direction dir) { // TODO remove this function and move these checks elsewhere... - static const size_t MAX_FIRE_BULLETS = 2; - static const size_t MAX_ICE_BULLETS = 1; Bullet* new_bullet = 0; if(player_status->bonus == FIRE_BONUS) { - if(bullets.size() > MAX_FIRE_BULLETS-1) + if((int)bullets.size() >= player_status->max_fire_bullets) return false; new_bullet = new Bullet(pos, xm, dir, FIRE_BULLET); } else if(player_status->bonus == ICE_BONUS) { - if(bullets.size() > MAX_ICE_BULLETS-1) + if((int)bullets.size() >= player_status->max_ice_bullets) return false; new_bullet = new Bullet(pos, xm, dir, ICE_BULLET); } else { @@ -1140,7 +1196,7 @@ Sector::inside(const Rect& rect) const { if(rect.p1.x > solids->get_width() * 32 || rect.p1.y > solids->get_height() * 32 - || rect.p2.x < 0 || rect.p2.y < 0) + || rect.p2.x < 0) return false; return true;