[Gcblue-commits] gcb_wx/src/graphics tcMapView.cpp,1.20,1.21 tcStartView.cpp,1.7,1.8 tcTerrainView.cpp,1.4,1.5

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

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

Modified Files:
	tcMapView.cpp tcStartView.cpp tcTerrainView.cpp 
Log Message:
OpenAL++ issues, fixed minimization of world map, shift+left click now changes theater on world map

Index: tcStartView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStartView.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcStartView.cpp	11 Mar 2005 02:34:57 -0000	1.7
--- tcStartView.cpp	19 Mar 2005 15:31:09 -0000	1.8
***************
*** 95,99 ****
      color._v[3] = alpha;
      
! 	DrawTextR("March 10, 2005 Build", 85.0, 150.0, 
          GetDefaultFont(), color, 24.0, LEFT_BASE_LINE);
  
--- 95,102 ----
      color._v[3] = alpha;
      
! 
!     wxString s = wxString::Format("%s Limited Release Build", __DATE__);
! 
!     DrawTextR(s.c_str(), 85.0, 150.0, 
          GetDefaultFont(), color, 24.0, LEFT_BASE_LINE);
  

Index: tcTerrainView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcTerrainView.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcTerrainView.cpp	11 Mar 2005 02:34:57 -0000	1.4
--- tcTerrainView.cpp	19 Mar 2005 15:31:09 -0000	1.5
***************
*** 43,46 ****
--- 43,47 ----
      {
          if (!redraw) return;
+ 
          DrawZoomedImage(mapImage.get(), 0, 0, (float)mnWidth, (float)mnHeight,
  		    displayRegion, ALIGN_BOTTOM_LEFT);
***************
*** 191,200 ****
  
      /**
!     * call tcWindow::SetActive(false) on Minimize()
      */
      void tcTerrainView::Minimize()
      {
!         tc3DWindow::SetActive(false);
          tc3DWindow::Minimize();
      }
  
--- 192,212 ----
  
      /**
!     * 
!     */
!     void tcTerrainView::Maximize()
!     {
!         tc3DWindow::Maximize();
!         redraw = true;
!     }
! 
! 
!     /**
!     * 
      */
      void tcTerrainView::Minimize()
      {
!        // tc3DWindow::SetActive(false);
          tc3DWindow::Minimize();
+         redraw = true;
      }
  

Index: tcMapView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcMapView.cpp	10 Mar 2005 03:28:28 -0000	1.20
--- tcMapView.cpp	19 Mar 2005 15:31:08 -0000	1.21
***************
*** 611,615 ****
      tcMapView::Thaw(); // unfreeze every Draw() call, works with Freeze() to stop resize flicker 
  
!     if (mnScrollState >= SCROLL_DELAY) 
      {
          ScrollMap(mfScrollDirection);
--- 611,615 ----
      tcMapView::Thaw(); // unfreeze every Draw() call, works with Freeze() to stop resize flicker 
  
!     if ((mnScrollState >= SCROLL_DELAY)  && (mnScrollState % 2 == 0))
      {
          ScrollMap(mfScrollDirection);
***************
*** 2728,2736 ****
  }
  
  /***********************************************************************************/
  void tcWorldMapView::OnLButtonDown(wxMouseEvent& event) 
  {
      wxPoint point = event.GetPosition();
! 	if (event.ControlDown() && event.ShiftDown())
  	{
  		tcSound::Get()->PlayEffect("Beep2");
--- 2728,2740 ----
  }
  
+ void tcWorldMapView::OnChar(wxKeyEvent& event)
+ {
+ }
+ 
  /***********************************************************************************/
  void tcWorldMapView::OnLButtonDown(wxMouseEvent& event) 
  {
      wxPoint point = event.GetPosition();
! 	if (event.ShiftDown())
  	{
  		tcSound::Get()->PlayEffect("Beep2");