From 14ea3d9d037175d4d5326ac9c83fe69ddcd0d9c4 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Mon, 8 Oct 2012 19:58:08 +0000
Subject: added zone flags, renamed Entity::flag_is_set() to Entity::has_flag()
---
src/game/base/game.cc | 2 +-
src/game/base/savegame.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/game/base')
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;
}
--
cgit v1.2.3