From 7eb26c8710b4d3469b57bf1020666b1c9c6b7866 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Wed, 1 Jul 2015 01:27:06 -0500
Subject: [PATCH] #1699 - Rally point object names

---
 addons/respawn/CfgAddons.hpp                    | 2 +-
 addons/respawn/config.cpp                       | 2 +-
 addons/respawn/functions/fnc_moveRallypoint.sqf | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/respawn/CfgAddons.hpp b/addons/respawn/CfgAddons.hpp
index 2793ac09da..111613615e 100644
--- a/addons/respawn/CfgAddons.hpp
+++ b/addons/respawn/CfgAddons.hpp
@@ -1,5 +1,5 @@
 class CfgAddons {
     class GVAR(Rallypoints) {
-        list[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" };
+        list[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_Rallypoint_West_Base", "ACE_Rallypoint_East_Base", "ACE_Rallypoint_Independent_Base"};
     };
 };
diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp
index daed5e2ab0..4a23d1f650 100644
--- a/addons/respawn/config.cpp
+++ b/addons/respawn/config.cpp
@@ -3,7 +3,7 @@
 class CfgPatches {
     class ADDON {
         units[] = {};
-        weapons[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" };
+        weapons[] = {"ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_Rallypoint_West_Base", "ACE_Rallypoint_East_Base", "ACE_Rallypoint_Independent_Base"};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = { "ace_common" };
         author[] = { "bux578", "commy2" };
diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf
index 5a0472cf5b..d512c23886 100644
--- a/addons/respawn/functions/fnc_moveRallypoint.sqf
+++ b/addons/respawn/functions/fnc_moveRallypoint.sqf
@@ -26,10 +26,12 @@ private ["_rallypoint", "_position"];
 _rallypoint = [
   objNull,
   missionNamespace getVariable ["ACE_Rallypoint_West", objNull],
-  missionNamespace getVariable ["ACE_RallypointExit_East", objNull],
-  missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull]
+  missionNamespace getVariable ["ACE_Rallypoint_East", objNull],
+  missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull]
 ] select ([west, east, independent] find _side) + 1;
 
+TRACE_3("moving rally",_unit, _rallypoint, (typeOf _rallypoint));
+
 if (isNull _rallypoint) exitWith {};
 
 _position = getPosATL _unit;