Ticket #2131: hero.diff

binaries/data/mods/public/gui/session/session.js

@@ -468 +468 @@
             g_Selection.reset(); 
         g_Selection.addList([hero]); 
     };
-    heroButton.ondoublepress = function() { selectAndMoveTo(hero) };
+    heroButton.ondoublepress = function() { selectAndMoveTo(getEntityOrHolder(hero)) };
     heroButton.hidden = false;
 
     // Setup tooltip

binaries/data/mods/public/gui/session/utility_functions.js

@@ -573 +573 @@
 
     return tooltip;
 }
+
+/**
+ * Returns the entity itself except when garrisoned where it returns its garrisonHolder
+ */
+function getEntityOrHolder(ent)
+{
+    var entState = GetEntityState(ent);
+    if (entState && !entState.position)
+        if (entState.unitAI && entState.unitAI.orders.length > 0 && entState.unitAI.orders[0].type == "Garrison")
+            return entState.unitAI.orders[0].data.target;
+
+    return ent;
+}