From e55638d081e2e1ff6fbc06e0e8ac0381a04308e7 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 15 Sep 2010 21:29:18 +0000
Subject: updated comments, updated buy menu, info support for map window,
 added const to target selection

---
 src/client/targets.cc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/client/targets.cc')

diff --git a/src/client/targets.cc b/src/client/targets.cc
index cc7f29f..46643bb 100644
--- a/src/client/targets.cc
+++ b/src/client/targets.cc
@@ -38,9 +38,9 @@ const float TARGETBOXRADIUS = 0.025f;
 unsigned int current_target_id = 0;
 unsigned int current_hover = 0;
 
-core::Entity *current_target = 0;
+const core::Entity *current_target = 0;
 
-bool is_valid_hud_target(core::Entity *entity)
+bool is_valid_hud_target(const core::Entity *entity)
 {
 	if (entity->serverside()) {
 		return false;
@@ -53,7 +53,7 @@ bool is_valid_hud_target(core::Entity *entity)
 	}
 }
 
-bool is_valid_map_target(core::Entity *entity)
+bool is_valid_map_target(const core::Entity *entity)
 {
 	if (entity->serverside()) {
 		return false;
@@ -68,7 +68,7 @@ bool is_valid_map_target(core::Entity *entity)
 	}
 }
 
-core::Entity* current()
+const core::Entity* current()
 {
 	return current_target;
 }
@@ -83,7 +83,7 @@ unsigned int hover()
 	return current_hover;
 }
 
-void select_target(core::Entity *entity)
+void set_target(const core::Entity *entity)
 {
 	current_target = entity;
 	if (entity) {
@@ -94,7 +94,7 @@ void select_target(core::Entity *entity)
 	}
 }
 
-void select_target(unsigned int id)
+void set_target(unsigned int id)
 {
 	if (!core::localcontrol())
 		return;
@@ -105,7 +105,7 @@ void select_target(unsigned int id)
 	core::Entity *entity = zone->find_entity(id);
 
 	if (entity && is_valid_hud_target(entity))
-		select_target(entity);
+		set_target(entity);
 }
 
 void func_target_next(std::string const &args)
@@ -154,7 +154,7 @@ void func_target_next(std::string const &args)
 	}
 
 	if (it !=  zone->content().end()) {
-		select_target((*it));
+		set_target((*it));
 	} else {
 		current_target = 0;
 		current_target_id = 0;
@@ -206,7 +206,7 @@ void func_target_prev(std::string const &args)
 	}
 
 	if (rit != zone->content().rend()) {
-		select_target((*rit));
+		set_target((*rit));
 	} else {
 		current_target = 0;
 		current_target_id = 0;
@@ -225,12 +225,12 @@ void func_target_center(std::string const &args)
 		return;
 
 	// this is essentialy the hover algorithm with the cursor in the center
-	core::Entity *new_target = 0;
+	const core::Entity *new_target = 0;
 	math::Vector3f center = render::Camera::eye() + render::Camera::axis().forward() * (render::FRUSTUMFRONT + 0.001);
 	float smallest_d = -1;
 
-	for (core::Zone::Content::iterator it = core::localcontrol()->zone()->content().begin(); it != core::localcontrol()->zone()->content().end(); it++) {
-		core::Entity *entity = (*it);
+	for (core::Zone::Content::const_iterator it = core::localcontrol()->zone()->content().begin(); it != core::localcontrol()->zone()->content().end(); it++) {
+		const core::Entity *entity = (*it);
 
 		math::Vector3f v(entity->location() - render::Camera::eye());
 		v.normalize();
@@ -249,7 +249,7 @@ void func_target_center(std::string const &args)
 	}
 
 	if (new_target)
-		select_target(new_target);
+		set_target(new_target);
 }
 
 void reset()
-- 
cgit v1.2.3