Fixed Bug #6516: Cactus selection problem in Magnant

doc/ChangeLog.html

@@ -36,6 +36,7 @@
 <li>Future 2.00 Release<p>
     <ul>
     <li>++
+    <li>Fixed Bug #6516: Cactus selection problem in Magnant (from Russell Smith).
     <li>Fixed Bug #6427 and added a brand new seen mechanism (from Crestez Leonard).
     <li>Fixed Bug #6391: Infinite loop in UpdateMinimap() (from Russell Smith).
     <li>Major clean-up in checking goals that disappear and unit reference counting (from Crestez Leonard).

src/stratagus/selection.cpp

@@ -168,7 +168,7 @@ global int SelectUnit(Unit* unit)
 	return 0;
     }
 
-    if (!unit->Type->Selectable) {
+    if (!unit->Type->Selectable && GameRunning) {
 	return 0;
     }
 
@@ -288,7 +288,7 @@ global int SelectUnitsByType(Unit* base)
 	HandleSuicideClick(base);
     }
 
-    if (!base->Type->Selectable) {
+    if (!base->Type->Selectable && GameRunning) {
 	return 0;
     }
 

src/ui/mainscr.cpp

@@ -1183,9 +1183,10 @@ global void DrawInfoPanel(void)
     //	Nothing selected
 
     DrawInfoPanelBackground(0);
-    if (UnitUnderCursor && UnitVisibleOnMap(UnitUnderCursor)) {
-	// FIXME: not correct for enemies units
-	DrawUnitInfo(UnitUnderCursor);
+    if (UnitUnderCursor && UnitVisibleOnMap(UnitUnderCursor)  &&
+	(UnitUnderCursor->Type->Selectable || !GameRunning)) {
+	    // FIXME: not correct for enemies units
+	    DrawUnitInfo(UnitUnderCursor);
     } else {
 	int x;
 	int y;