added zone flags,

renamed Entity::flag_is_set() to Entity::has_flag()

3 files changed, 5 insertions, 5 deletions

diff --git a/src/client/mapwidget.cc b/src/client/mapwidget.cc
index 44ec32a..0a4ec72 100644
--- a/src/client/mapwidget.cc
+++ b/src/client/mapwidget.cc
@@ -144,7 +144,7 @@ void MapWidget::draw()
 
 		if (draw_icon) {
 			if (entity->type() == core::Entity::Globe) {
-				if (entity->flag_is_set(core::Entity::Bright)) {
+				if (entity->has_flag(core::Entity::Bright)) {
 					if (texture_current != texture_bright) {
 						gl::end();
 						texture_current = render::Textures::bind(texture_bright);
diff --git a/src/client/mapwindow.cc b/src/client/mapwindow.cc
index 1c429dd..e6bc5bb 100644
--- a/src/client/mapwindow.cc
+++ b/src/client/mapwindow.cc
@@ -236,11 +236,11 @@ void MapWindow::show_entity_info(const core::Entity *entity)
 			mapwindow_modelview->set_colors(globe->color(), globe->color_second());
 			mapwindow_modelview->set_globetexturename(
 				globe->texturename(),
-				globe->flag_is_set(core::Entity::Bright),
+				globe->has_flag(core::Entity::Bright),
 				globe->coronaname()
 			);
 			mapwindow_modelview->set_zoom(2.5f);
-			if (globe->flag_is_set(core::Entity::Bright)) {
+			if (globe->has_flag(core::Entity::Bright)) {
 				mapwindow_modelview->set_radius(0.5f);
 			} else {
 				mapwindow_modelview->set_radius(1.0f);
diff --git a/src/client/targets.cc b/src/client/targets.cc
index eff1512..9137739 100644
--- a/src/client/targets.cc
+++ b/src/client/targets.cc
@@ -46,7 +46,7 @@ bool is_valid_map_target(const core::Entity *entity)
 		return false;
 	} else if (entity == core::localcontrol()) {
 		return false;
-	} else if (entity->flag_is_set(core::Entity::ShowOnMap)) {
+	} else if (entity->has_flag(core::Entity::ShowOnMap)) {
 		return true;
 	} else 	if (entity == core::localplayer()->mission_target()) {
 		return true;
@@ -61,7 +61,7 @@ bool is_valid_hud_target(const core::Entity *entity)
 		return false;
 	} else if (entity == core::localcontrol()) {
 		return false;
-	} else if (entity->flag_is_set(core::Entity::ShowOnMap)) {
+	} else if (entity->has_flag(core::Entity::ShowOnMap)) {
 		return true;
 	} else 	if (entity == core::localplayer()->mission_target()) {
 		return true;