[Gcblue-commits] gcb_wx/include/common simmath.h,1.4,1.5 tcConsole.h,1.5,1.6 tcSoundConsole.h,1.4,1.5 wxcommands.h,1.5,1.6

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

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

Modified Files:
	simmath.h tcConsole.h tcSoundConsole.h wxcommands.h 
Log Message:
briefing camera features

Index: simmath.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** simmath.h	19 Nov 2003 01:36:14 -0000	1.4
--- simmath.h	3 Jan 2004 00:45:12 -0000	1.5
***************
*** 30,33 ****
--- 30,34 ----
  #include "tcString.h"
  #include "gctypes.h"
+ #include "tcDatabaseObject.h"
  
  #ifndef UINT8
***************
*** 109,112 ****
--- 110,116 ----
          mnPassivePlatformID = -1;
      }
+     bool IsAir() {return ((mnClassification & PTYPE_AIR) != 0);}
+     bool IsMissile() {return ((mnClassification & PTYPE_MISSILE) != 0);}
+     bool IsSurface() {return ((mnClassification & PTYPE_SURFACE) != 0);}
      bool IsValid() {return mnID != -1;}
      void SetAllValid() {mnFlags |= 0x0F;}

Index: tcConsole.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcConsole.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcConsole.h	22 Dec 2003 02:32:37 -0000	1.5
--- tcConsole.h	3 Jan 2004 00:45:12 -0000	1.6
***************
*** 56,59 ****
--- 56,60 ----
      virtual int Draw(); ///< draw using GDI+
      int DrawGdi(void); ///< draw using GDI 
+     void ForceRedraw() {mbForceRedraw = true;}
      void InitGdi(float afFontSize, UINT32 anColor);
      bool IsCurrentLineEmpty();
***************
*** 69,73 ****
  private:
      int useDelayedTextEffect;
!     int mbRedraw;
      Gdiplus::Pen *mpPen;
      Gdiplus::SolidBrush *mpBrush;
--- 70,75 ----
  private:
      int useDelayedTextEffect;
!     int mbRedraw; ///< redraw based on cursor update state
!     bool mbForceRedraw; ///< a workaround to force redraw when button state changes
      Gdiplus::Pen *mpPen;
      Gdiplus::SolidBrush *mpBrush;

Index: tcSoundConsole.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSoundConsole.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSoundConsole.h	21 Dec 2003 00:40:00 -0000	1.4
--- tcSoundConsole.h	3 Jan 2004 00:45:12 -0000	1.5
***************
*** 31,35 ****
  #include "wx/msw/private.h" // for MS Windows specific definitions
  #include "tcConsole.h"
! #include "tcSound.h"
  
  class tcSoundConsole : public tcConsole 
--- 31,36 ----
  #include "wx/msw/private.h" // for MS Windows specific definitions
  #include "tcConsole.h"
! 
! class tcSound;
  
  class tcSoundConsole : public tcConsole 

Index: wxcommands.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/wxcommands.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxcommands.h	22 Dec 2003 02:32:37 -0000	1.5
--- wxcommands.h	3 Jan 2004 00:45:12 -0000	1.6
***************
*** 40,43 ****
--- 40,45 ----
      ID_SETPAUSE, ///< enable/disable game pause
      ID_SET3D, ///< set 3D window size 
+     ID_SKIPBRIEFING, ///< skip tactical briefing
+     ID_BUTTONREDRAW, ///< posted by button to force parent to redraw
  };