Changeset 9471 for code/branches

Timestamp:

Nov 28, 2012, 11:02:55 PM (12 years ago)

Author:

jo

Message:

I fixed the console command. A console command has to be a static function. I used the same workaround as in NewHumanController to bypass the static behaviour of the concerning functions.

Location:

code/branches/spaceNavigation/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (4 diffs)
• HUDNavigation.h (modified) (2 diffs)

code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.cc

@@ -59 +59 @@
 {
 
-    SetConsoleCommand("selectClosest", &HUDNavigation::selectClosestTarget);
-    SetConsoleCommand("selectNext", &HUDNavigation::selectNextTarget);
+    SetConsoleCommand("HUDNavigation","selectClosest", &HUDNavigation::selectClosestTarget).addShortcut().keybindMode(KeybindMode::OnPress);
+    SetConsoleCommand("HUDNavigation","selectNext", &HUDNavigation::selectNextTarget).addShortcut().keybindMode(KeybindMode::OnPress);
 
     static bool compareDistance(std::pair<RadarViewable*, unsigned int> a,
@@ -68 +68 @@
     }
     CreateFactory ( HUDNavigation );
+
+    HUDNavigation* HUDNavigation::localHUD_s = 0;
 
     HUDNavigation::HUDNavigation(BaseObject* creator) :
@@ -86 +88 @@
         this->closestTarget_ = true;
         this->nextTarget_ = false;
+        HUDNavigation::localHUD_s = this;
     }
 
@@ -544 +547 @@
     void HUDNavigation::selectClosestTarget()
     {
-        this->closestTarget_ = true;
-        orxout() << "selectClosestTarget" << std::endl;
+        if(HUDNavigation::localHUD_s)
+        {
+            HUDNavigation::localHUD_s->closestTarget_ = true;
+            orxout() << "selectClosestTarget" << std::endl;
+        }
     }
 
     void HUDNavigation::selectNextTarget()
     {
-        this->nextTarget_ = true;
-        orxout() << "selectNextTarget" << std::endl;
+        if(HUDNavigation::localHUD_s)
+        {
+            HUDNavigation::localHUD_s->nextTarget_ = true;
+            orxout() << "selectNextTarget" << std::endl;
+        }
     }
 }

code/branches/spaceNavigation/src/modules/overlays/hud/HUDNavigation.h

@@ -71 +71 @@
                 { return this->markerLimit_; }
 
-            void selectClosestTarget();
-            void selectNextTarget();
+            static void selectClosestTarget();
+            static void selectNextTarget();
 
         private:
@@ -132 +132 @@
             static const float LIGHTNING_GUN_SPEED_ = 700.0f;
             static const float HSW01_SPEED_ = 2500.0f;
+            static HUDNavigation* localHUD_s; //!< This is used as a filter to only influence the local HUD.
+
 
             float currentMunitionSpeed_;