Introduced global variables for reputation hostile/friendly thresholds,

do not allow players to dock at hostile bases,
indicate target reputation in the hud target info widget.

1 files changed, 29 insertions, 8 deletions

diff --git a/src/client/targets.cc b/src/client/targets.cc
index 3c3b2b8..088d334 100644
--- a/src/client/targets.cc
+++ b/src/client/targets.cc
@@ -243,7 +243,13 @@ void func_target_controlable_next(std::string const &args)
 	if (!current_target_id) {
 		// first entity
 		it = zone->content().begin();
-		while ((it != zone->content().end()) && (((*it)->type() != core::Entity::Controlable) ||  !is_valid_hud_target((*it))))	{
+		while (
+			(it != zone->content().end()) && (
+				((*it)->type() != core::Entity::Controlable) ||  
+				(math::distancesquared(core::localcontrol()->location(), (*it)->location()) > core::range::fxdistance * core::range::fxdistance) ||
+				!is_valid_hud_target((*it))
+			)
+		) {
 			++it;
 		}
 
@@ -268,12 +274,12 @@ void func_target_controlable_next(std::string const &args)
 		if (it ==  zone->content().end()) {
 			it =  zone->content().begin();
 		}
-		while (
-			!(
-				is_valid_hud_target((*it)) &&
+		while (!(
+				is_valid_hud_target((*it)) && 
 				((*it)->type() == core::Entity::Controlable) &&  
 				((static_cast<core::EntityControlable *>((*it))->owner() || (math::distancesquared(core::localcontrol()->location(), (*it)->location()) < core::range::fxdistance * core::range::fxdistance))) 
-		)) {
+			)
+		) {
 			it++;
 			if (it == zone->content().end())
 				it = zone->content().begin();
@@ -315,7 +321,13 @@ void func_target_controlable_prev(std::string const &args)
 	if (!current_target_id) {
 		// last entity
 		rit = zone->content().rbegin();
-		while ((rit != zone->content().rend()) && (((*rit)->type() != core::Entity::Controlable) ||  !is_valid_hud_target((*rit)))) {
+		while (
+			(rit != zone->content().rend()) && (
+				((*rit)->type() != core::Entity::Controlable) ||  
+				(math::distancesquared(core::localcontrol()->location(), (*rit)->location()) > core::range::fxdistance * core::range::fxdistance) ||
+				!is_valid_hud_target((*rit))
+			)
+		) {
 			++rit;
 		}
 		
@@ -340,7 +352,12 @@ void func_target_controlable_prev(std::string const &args)
 		if (rit ==  zone->content().rend()) {
 			rit =  zone->content().rbegin();
 		}
-		while (!(((*rit)->type() == core::Entity::Controlable) && is_valid_hud_target((*rit))) ) {
+		while (!(
+				is_valid_hud_target((*rit)) && 
+				((*rit)->type() == core::Entity::Controlable) &&  
+				((static_cast<core::EntityControlable *>((*rit))->owner() || (math::distancesquared(core::localcontrol()->location(), (*rit)->location()) < core::range::fxdistance * core::range::fxdistance))) 
+			)
+		) {				
 			++rit;
 			if (rit == zone->content().rend())
 				rit = zone->content().rbegin();
@@ -352,7 +369,11 @@ void func_target_controlable_prev(std::string const &args)
 		}
 	}
 
-	if ((rit !=  zone->content().rend()) && ((*rit)->type() == core::Entity::Controlable) && is_valid_hud_target((*rit))) {
+	if ((rit !=  zone->content().rend()) && 
+				is_valid_hud_target((*rit)) &&
+				((*rit)->type() == core::Entity::Controlable) &&  
+				((static_cast<core::EntityControlable *>((*rit))->owner() || (math::distancesquared(core::localcontrol()->location(), (*rit)->location()) < core::range::fxdistance * core::range::fxdistance))) 
+	) {
 		set_target((*rit));
 	} else {
 		current_target = 0;