[Gcblue-commits] gcb_wx/src/graphics tcControl.cpp, 1.2, 1.3 tcGraphicsInfo.cpp, 1.1, 1.2 tcStoresGui.cpp, 1.10, 1.11

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

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

Modified Files:
	tcControl.cpp tcGraphicsInfo.cpp tcStoresGui.cpp 
Log Message:


Index: tcStoresGui.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStoresGui.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcStoresGui.cpp	20 Nov 2006 00:17:42 -0000	1.10
--- tcStoresGui.cpp	27 Nov 2006 00:46:39 -0000	1.11
***************
*** 104,108 ****
  	wxString captionText = wxString::Format("%s: %s", unitName, storesDisplayName.c_str());
  	DrawTextR(captionText.c_str(), 10.0f, 20.0f, defaultFont.get(),
!         captionColor, 18.0f, LEFT_BASE_LINE, 100.0f + guiWidth - 20.0f);    
      
  
--- 104,108 ----
  	wxString captionText = wxString::Format("%s: %s", unitName, storesDisplayName.c_str());
  	DrawTextR(captionText.c_str(), 10.0f, 20.0f, defaultFont.get(),
!         captionColor, 18.0f, LEFT_BASE_LINE, guiWidth - 20.0f);    
      
  
***************
*** 459,463 ****
  	   hostId(host),
  	   storesIdx(idx),
!        slotsPerPage(10),
         nPages(1),
         currentPage(0),
--- 459,463 ----
  	   hostId(host),
  	   storesIdx(idx),
!        slotsPerPage(8),
         nPages(1),
         currentPage(0),

Index: tcControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcControl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcControl.cpp	23 Mar 2006 01:11:02 -0000	1.2
--- tcControl.cpp	27 Nov 2006 00:46:39 -0000	1.3
***************
*** 65,69 ****
  void tcControl::SetGameObject(tcGameObject* gameObj)
  {
-     wxASSERT(gameObj);
      obj = gameObj;
  }
--- 65,68 ----

Index: tcGraphicsInfo.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcGraphicsInfo.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcGraphicsInfo.cpp	24 Sep 2006 19:50:20 -0000	1.1
--- tcGraphicsInfo.cpp	27 Nov 2006 00:46:39 -0000	1.2
***************
*** 266,275 ****
      if (!Is3DCapable())
      {
!         std::string text = "GCB requires OpenGL-compatible 3D hardware acceleration."
              " (";
          text += GetDriverInfo();
          text += ")\n";
!         throw(text);
      }
      if (!Is3DAlphaCapable())
      {
--- 266,278 ----
      if (!Is3DCapable())
      {
!         std::string text = "Could not find OpenGL-compatible 3D hardware acceleration. Please post on gcblue.com/forum. Using _s l o w_ software rendering."
              " (";
          text += GetDriverInfo();
          text += ")\n";
! 
!         wxMessageBox(text.c_str(), "Warning",wxICON_WARNING);
!         //throw(text);
      }
+ 
      if (!Is3DAlphaCapable())
      {