[Gcblue-commits] gcb_wx/src/graphics tcCreditView.cpp,1.12,1.13 tcHookInfo.cpp,1.8,1.9 tcMessageCenter.cpp,1.5,1.6 tcMessageInterface.cpp,1.2,1.3 tcStartView.cpp,1.8,1.9

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

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

Modified Files:
	tcCreditView.cpp tcHookInfo.cpp tcMessageCenter.cpp 
	tcMessageInterface.cpp tcStartView.cpp 
Log Message:
0.7.0 release snapshot

Index: tcStartView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStartView.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcStartView.cpp	19 Mar 2005 15:31:09 -0000	1.8
--- tcStartView.cpp	29 Mar 2005 00:12:27 -0000	1.9
***************
*** 96,100 ****
      
  
!     wxString s = wxString::Format("%s Limited Release Build", __DATE__);
  
      DrawTextR(s.c_str(), 85.0, 150.0, 
--- 96,100 ----
      
  
!     wxString s = wxString::Format("%s Test Build", __DATE__);
  
      DrawTextR(s.c_str(), 85.0, 150.0, 

Index: tcMessageCenter.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMessageCenter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcMessageCenter.cpp	8 Mar 2005 00:41:49 -0000	1.5
--- tcMessageCenter.cpp	29 Mar 2005 00:12:26 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  #include "tcMessageChannel.h"
  #include "tcPopupMessage.h"
+ #include "tcSoundConsole.h"
  
  #include <stdio.h>
***************
*** 43,46 ****
--- 44,52 ----
  }
  
+ void tcMessageCenter::AttachConsole(tcSoundConsole* console_)
+ {
+     console = console_;
+ }
+ 
  /**
  * Removes and deletes all channels
***************
*** 59,62 ****
--- 65,77 ----
  }
  
+ /**
+ * Writes a message to the text console
+ */
+ void tcMessageCenter::ConsoleMessage(const std::string& msg)
+ {
+     wxASSERT(console);
+ 
+     console->Print(msg.c_str());
+ }
  
  /**
***************
*** 197,201 ****
              activeChannelName(""),
              popupBase(205, 70),
!             popupCount(0)
  {
      channelTab.Set(10, 140, 10, 30);
--- 212,217 ----
              activeChannelName(""),
              popupBase(205, 70),
!             popupCount(0),
!             console(0)
  {
      channelTab.Set(10, 140, 10, 30);

Index: tcCreditView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcCreditView.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcCreditView.cpp	10 Mar 2005 03:28:28 -0000	1.12
--- tcCreditView.cpp	29 Mar 2005 00:12:26 -0000	1.13
***************
*** 2,6 ****
  **  @file tcCreditView.cpp
  */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
--- 2,6 ----
  **  @file tcCreditView.cpp
  */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 54,61 ****
  
      s = "------- C R E D I T S -------";
!     AddCredit(s, 40.0f, 1);
  
-     s = "Credits not updated for 0.7 yet";
-     AddCredit(s, 45.0f, 1);
  
      s = "GCB 0.6 Credits";
--- 54,86 ----
  
      s = "------- C R E D I T S -------";
!     AddCredit(s, 60.0f, 1);
! 
!     s = "Dewitt Colclough";
!     AddCredit(s, 25.0f, 1);
! 
!     s = "Project manager and lead developer\n";
!     AddCredit(s, 80.0f, 0);
! 
!     s = "--- 3D art ---"; 
!     AddCredit(s, 25.0f, 1);
! 
!     s = "Guido Militello"; 
!     AddCredit(s, 25.0f, 1);
! 
!     s = "Marcelo C\341ceres (op4_delta)"; 
!     AddCredit(s, 25.0f, 1);
! 
!     s = "TLAM Strike"; 
!     AddCredit(s, 25.0f, 1);
! 
!     s = "Jason Simpson"; 
!     AddCredit(s, 60.0f, 1);
! 
!     s = "--- Test ---"; 
!     AddCredit(s, 25.0f, 1);
! 
!     s = "Dust"; 
!     AddCredit(s, 125.0f, 1);
  
  
      s = "GCB 0.6 Credits";
***************
*** 128,134 ****
      AddCredit(s, 30.0f, 0);
  
!     s = "wxWindows\n";
      AddCredit(s, 20.0f, 0);
!     s =  "www.wxwindows.org\n";
      AddCredit(s, 30.0f, 0);
  
--- 153,159 ----
      AddCredit(s, 30.0f, 0);
  
!     s = "wxWidgets\n";
      AddCredit(s, 20.0f, 0);
!     s =  "www.wxwidgets.org\n";
      AddCredit(s, 30.0f, 0);
  
***************
*** 176,180 ****
      AddCredit(s, 20.0f, 0);
  
!     s = "Copyright (C) 2002-2004, All rights reserved.\n";
      AddCredit(s, 60.0f, 0);
  
--- 201,205 ----
      AddCredit(s, 20.0f, 0);
  
!     s = "Copyright (C) 2002-2005, All rights reserved.\n";
      AddCredit(s, 60.0f, 0);
  

Index: tcMessageInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMessageInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcMessageInterface.cpp	2 Dec 2004 04:17:25 -0000	1.2
--- tcMessageInterface.cpp	29 Mar 2005 00:12:26 -0000	1.3
***************
*** 45,48 ****
--- 45,55 ----
  }
  
+ void tcMessageInterface::ConsoleMessage(const std::string& msg)
+ {
+     wxASSERT(messageCenter);
+ 
+     messageCenter->ConsoleMessage(msg);
+ }
+ 
  /**
  *

Index: tcHookInfo.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcHookInfo.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcHookInfo.cpp	10 Mar 2005 03:28:28 -0000	1.8
--- tcHookInfo.cpp	29 Mar 2005 00:12:26 -0000	1.9
***************
*** 424,427 ****
--- 424,432 ----
  		DrawTextR(zBuff, ftextx, ftexty, defaultFont.get(), color, fontSize, LEFT_BASE_LINE);
          ftexty += 15;
+ 
+         sprintf(zBuff, "Distance: %.1f km", 0.001f * missile->GetDistanceFromLaunch());
+ 
+ 		DrawTextR(zBuff, ftextx, ftexty, defaultFont.get(), color, fontSize, LEFT_BASE_LINE);
+         ftexty += 15;
          
      }