added jumppoint and jumpgate templates, corrected a number of potentional

radius related bugs

1 files changed, 20 insertions, 8 deletions

diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc
index e52873e..1f2c0a9 100644
--- a/src/game/base/jumppoint.cc
+++ b/src/game/base/jumppoint.cc
@@ -12,16 +12,24 @@ namespace game
 
 /* ---- class JumpPoint -------------------------------------------- */
 
+const Template *JumpPoint::jumppoint_template = 0;
+
 JumpPoint::JumpPoint() : core::EntityDynamic()
 {
 	set_shape(core::Entity::Diamond);
+
+	// FIXME jumppoints should be harder to find
+	set_flag(core::Entity::ShowOnMap);
+	
 	get_color().assign(0.0f, 0.8f, 0.8f, 1.0f);
 	get_color_second().assign(0.6f, 1.0f);
 	set_radius(0.25f);
+	
 	set_flag(core::Entity::Bright);
-	// FIXME jumppoints should be harder to find
-	set_flag(core::Entity::ShowOnMap);
-
+	
+	if (jumppoint_template)
+		jumppoint_template->apply(this);
+	
 	entity_moduletypeid = jumppoint_enttype;
 	jumppoint_target = 0;
 	set_serverside(false);
@@ -94,15 +102,19 @@ void JumpPoint::validate()
 
 /* ---- class JumpGate --------------------------------------------- */
 
+const Template *JumpGate::jumpgate_template = 0;
+
 JumpGate::JumpGate() : JumpPoint()
 {
+	entity_moduletypeid = jumpgate_enttype;
 	unset_flag(core::Entity::Bright);
 	set_flag(core::Entity::ShowOnMap);
-	set_radius(1.0f);
-
-	entity_moduletypeid = jumpgate_enttype;
-	entity_state = core::Entity::NoPower;
-
+	set_radius(0.0f);
+	set_state(core::Entity::NoPower);
+	
+	if (jumpgate_template)
+		jumpgate_template->apply(this);
+	
 	jumpgate_timer = 0;
 }