[Gcblue-commits] gcb_wx/src/common tcConsole.cpp,1.5,1.6 tcSoundConsole.cpp,1.4,1.5

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

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1:/tmp/cvs-serv548/src/common

Modified Files:
	tcConsole.cpp tcSoundConsole.cpp 
Log Message:
briefing camera features

Index: tcConsole.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcConsole.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcConsole.cpp	22 Dec 2003 02:32:37 -0000	1.5
--- tcConsole.cpp	3 Jan 2004 00:45:12 -0000	1.6
***************
*** 87,90 ****
--- 87,91 ----
  /**
  * Draw console using GDI+ (default).
+ * @return 1 if Draw was performed, 0 otherwise
  */
  int tcConsole::Draw() 
***************
*** 98,102 ****
      UpdateCursor(); // update cursor position for delayed draw effect
  
!     if (mbRedraw || mbCloned)
      {
          if (!GetGraphics(pGraphics)) 
--- 99,103 ----
      UpdateCursor(); // update cursor position for delayed draw effect
  
!     if (mbRedraw || mbCloned || mbForceRedraw)
      {
          if (!GetGraphics(pGraphics)) 
***************
*** 149,156 ****
          ReleaseGraphics(pGraphics);
          DrawBorder();
!         //SetOpaque();
!         //mbRedraw = false;
      }
-     return 1;
  }
  
--- 150,160 ----
          ReleaseGraphics(pGraphics);
          DrawBorder();
!         mbForceRedraw = false;
!         return 1;
!     }
!     else
!     {
!         return 0; 
      }
  }
  
***************
*** 265,268 ****
--- 269,273 ----
  
      mbRedraw = true;
+     mbForceRedraw = true;
      useDelayedTextEffect = false;
      nlinespace = 15;

Index: tcSoundConsole.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/tcSoundConsole.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSoundConsole.cpp	21 Dec 2003 00:40:00 -0000	1.4
--- tcSoundConsole.cpp	3 Jan 2004 00:45:12 -0000	1.5
***************
*** 1,5 ****
  /*  
- **  tcSoundConsole.cpp
- **
  **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
--- 1,4 ----
+ /** @file tcSoundConsole.cpp */
  /*  
  **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
***************
*** 20,27 ****
  */
  
  
! #include "wx/wx.h" 
  #include "wx/msw/private.h" // for MS Windows specific definitions
  #include "tcSoundConsole.h"
  
  int tcSoundConsole::Draw() 
--- 19,37 ----
  */
  
+ #include "stdwx.h" // precompiled header file
  
! #ifndef WX_PRECOMP
! #include "wx/wx.h"
! #ifdef WIN32
  #include "wx/msw/private.h" // for MS Windows specific definitions
+ #endif
+ #endif
+ 
  #include "tcSoundConsole.h"
+ #include "tcSound.h"
+ 
+ #ifdef _DEBUG
+ #define new DEBUG_NEW
+ #endif
  
  int tcSoundConsole::Draw()