[Gcblue-commits] gcb_wx/src/graphics tcMapOverlay.cpp, 1.6, 1.7 tcMapView.cpp, 1.55, 1.56

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

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

Modified Files:
	tcMapOverlay.cpp tcMapView.cpp 
Log Message:


Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** tcMapView.cpp	20 Dec 2006 00:45:46 -0000	1.55
--- tcMapView.cpp	22 Dec 2006 14:29:14 -0000	1.56
***************
*** 2684,2687 ****
--- 2684,2695 ----
  void tcTacticalMapView::OnLButtonDClick(wxMouseEvent& event)
  {
+     if (overlay->IsInteracting())
+     {
+         overlay->ClearInteraction();
+         return;
+     }
+ 
+     if (hookedId.size() == 0) return;
+ 
  	wxPoint pos = event.GetPosition();
  

Index: tcMapOverlay.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapOverlay.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcMapOverlay.cpp	13 Dec 2006 02:10:58 -0000	1.6
--- tcMapOverlay.cpp	22 Dec 2006 14:29:14 -0000	1.7
***************
*** 255,259 ****
          tcMapObject* obj = overlayObjects[n];
  
!         if (true || obj->IsInteractive())
          {
              float dist = overlayObjects[n]->GetScreenDistanceFrom(pos);
--- 255,259 ----
          tcMapObject* obj = overlayObjects[n];
  
!         if (obj->IsInteractive())
          {
              float dist = overlayObjects[n]->GetScreenDistanceFrom(pos);