diff options
Diffstat (limited to 'src/game/base/game.cc')
| -rw-r--r-- | src/game/base/game.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index 7aa1081..40c7c28 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -54,7 +54,7 @@ core::Cvar *Game::g_impulsespeed = 0; core::Cvar *Game::g_jumppointrange = 0; core::Cvar *Game::g_devel = 0; core::Cvar *Game::g_damping = 0; -core::Cvar *Game::g_keepalive; +core::Cvar *Game::g_deplete = 0; core::Module *factory() { @@ -905,8 +905,8 @@ Game::Game() : core::Module("Project::OSiRiON", true) g_damping = core::Cvar::get("g_damping", "0.1", core::Cvar::Archive); g_damping->set_info("[float] physics damping factor (0-1)"); - g_keepalive = core::Cvar::get("g_keepalive", "300", core::Cvar::Archive); - g_keepalive->set_info("[float] amount of time dynamic objects are kept alive, in seconds"); + g_deplete = core::Cvar::get("g_deplete", "60", core::Cvar::Archive); + g_deplete->set_info("[int] number of seconds to deplete 1 unit of cargo from inventories"); } Game::~Game() @@ -915,7 +915,6 @@ Game::~Game() g_jumppointrange = 0; g_devel = 0; g_damping = 0; - g_keepalive = 0; // game functions are automaticly removed // FIXME move cleanup sequence to core:: @@ -1025,7 +1024,7 @@ bool Game::load_zone(core::Zone *zone) bool b; long l; - + std::string strval; while (zoneini.getline()) { @@ -1307,7 +1306,7 @@ bool Game::validate_zone(core::Zone *zone) JumpGate *jumpgate = static_cast<JumpGate *>(entity); jumpgate->validate(); } else { - if ((entity->flags() & core::Entity::Dockable) == core::Entity::Dockable) { + if (entity->flag_is_set(core::Entity::Dockable)) { generate_entity_menus(entity); } } @@ -1351,6 +1350,7 @@ bool Game::generate_entity_menus(core::Entity *entity) // add trade menus if (entity->inventory()) { + entity->set_flag(core::Entity::KeepAlive); size_t nbcargo = 0; size_t nbships = 0; |