diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-10-08 19:58:08 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-10-08 19:58:08 +0000 |
| commit | 14ea3d9d037175d4d5326ac9c83fe69ddcd0d9c4 (patch) | |
| tree | ace65b7504daa0791a8dd79e4278db1ea1ef304b /src/game | |
| parent | 66c776cc66d5c91ed3e798b0f5c5a30baf1f1d69 (diff) | |
added zone flags,
renamed Entity::flag_is_set() to Entity::has_flag()
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/base/game.cc | 2 | ||||
| -rw-r--r-- | src/game/base/savegame.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index 3fbcbb0..93145f7 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -1532,7 +1532,7 @@ bool Game::validate_zone(core::Zone *zone) JumpGate *jumpgate = static_cast<JumpGate *>(entity); jumpgate->validate(); } else { - if (entity->flag_is_set(core::Entity::Dockable)) { + if (entity->has_flag(core::Entity::Dockable)) { generate_entity_menus(entity); } } diff --git a/src/game/base/savegame.cc b/src/game/base/savegame.cc index b6955e2..702dd49 100644 --- a/src/game/base/savegame.cc +++ b/src/game/base/savegame.cc @@ -128,7 +128,7 @@ void SaveGame::load_game(core::Player *player, filesystem::IniFile & inifile) continue; } - if (!spawn_entity->flag_is_set(core::Entity::Dockable)) { + if (!spawn_entity->has_flag(core::Entity::Dockable)) { inifile.unknown_error("spawn '" + str + "' is not dockable"); continue; } |