[Gcblue-commits] gcb_wx/src/graphics tcMapView.cpp,1.34,1.35

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9407/src/graphics

Modified Files:
	tcMapView.cpp 
Log Message:


Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** tcMapView.cpp	27 Nov 2005 22:21:29 -0000	1.34
--- tcMapView.cpp	27 Nov 2005 22:34:58 -0000	1.35
***************
*** 1971,1974 ****
--- 1971,1975 ----
  * Single-unit hook.
  * Hooks a single object closest to pscreen
+ * Modified so that hook is not cleared if no object is close to click point
  */
  long tcTacticalMapView::Hook(wxPoint pscreen)
***************
*** 1986,1989 ****
--- 1987,1993 ----
  
      long nMinID = GetClosest(pscreen); 
+ 
+ 	if (nMinID == -1) return -1;
+ 
      if (nMinID != currentHook)
      {
***************
*** 2072,2076 ****
      geoRegion.Set(northWest.x, southEast.x, northWest.y, southEast.y);
  
!     hookedId.clear();
  
      // add all friendly units within region
--- 2076,2081 ----
      geoRegion.Set(northWest.x, southEast.x, northWest.y, southEast.y);
  
! 
! 	std::vector<long> newHooks;
  
      // add all friendly units within region
***************
*** 2083,2091 ****
              if (pMO->meAffiliation == FRIENDLY)
              {
!                 hookedId.push_back(pMO->mnID);
              }
          }
      }
  
  	long hookCount = GetHookCount();
  	wxCommandEvent command(wxEVT_COMMAND_BUTTON_CLICKED, ID_GROUPHOOK);    
--- 2088,2100 ----
              if (pMO->meAffiliation == FRIENDLY)
              {
!                 newHooks.push_back(pMO->mnID);
              }
          }
      }
  
+ 	if (newHooks.size() == 0) return;
+ 
+ 	hookedId = newHooks;
+ 
  	long hookCount = GetHookCount();
  	wxCommandEvent command(wxEVT_COMMAND_BUTTON_CLICKED, ID_GROUPHOOK);