[Planeshift-cvs] CVS: planeshift/src/client/gui psdcmain.cpp,1.15,1.16 psdcskil.cpp,1.5,1.6

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27648/src/client/gui

Modified Files:
	psdcmain.cpp psdcskil.cpp 
Log Message:
Changed to use new images. 

Index: psdcmain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcmain.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** psdcmain.cpp	2002/01/21 04:22:33	1.15
--- psdcmain.cpp	2002/01/22 04:42:25	1.16
***************
*** 47,52 ****
  bool psdcMain::Initialize()
  {   
!     if(!(bg = dmanager->CreateSprite("creachar.gif"))) return false;
!         bg->SetTextureRectangle(112,212, 800, 600);
  
      float ratiox = (float)width / 640.0f;
--- 47,80 ----
  bool psdcMain::Initialize()
  {   
!     //if(!(bg = dmanager->CreateSprite("creachar.gif"))) return false;
!     //bg->SetTextureRectangle(112,212, 800, 600);
! 
!     if ( width >= 1024 && height >= 768 )
!     {
! 	if(!(bg = dmanager->CreateSprite("crmain17.png"))) 
! 	    return false;
! 
! 	bg->SetTextureRectangle( 0,0, 1024, 768 );
!     }
! 
!     else if ( width == 800 && height == 600 )
!     {
! 	if(!(bg = dmanager->CreateSprite("crmain86.png"))) 
! 	    return false;
! 
! 	bg->SetTextureRectangle( 112,212, 800, 600 );
!     }
!     else 
!     {
! 	if(!(bg = dmanager->CreateSprite("crmain64.png"))) 
! 	{
! 	    printf("Could not load image!\n");
! 	    return false;
! 	}
! 
! 	bg->SetTextureRectangle( 192,144, 640, 480 );
!     }
! 
! 
  
      float ratiox = (float)width / 640.0f;

Index: psdcskil.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcskil.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** psdcskil.cpp	2002/01/11 00:04:14	1.5
--- psdcskil.cpp	2002/01/22 04:42:25	1.6
***************
*** 51,68 ****
      //if(!(bg = dmanager->CreateSprite("crskil17.jpg"))) return false;
      // determine which background image suitable for the current resolution
      if(width >= 1024 && height >= 768)
      {
! 	    if(!(bg = dmanager->CreateSprite("crskil17.jpg"))) return false;
!         //bg->SetTextureRectangle(0,128, 1024, 768);
      }
      else if(width == 800 && height == 600)
      {
          if(!(bg = dmanager->CreateSprite("crskil86.jpg"))) return false;
!         //bg->SetTextureRectangle(112,212, 800, 600);
      }
      else
      {
          if(!(bg = dmanager->CreateSprite("crskil64.jpg"))) return false;
!         //bg->SetTextureRectangle(192,16, 640, 480);
      }
  
--- 51,69 ----
      //if(!(bg = dmanager->CreateSprite("crskil17.jpg"))) return false;
      // determine which background image suitable for the current resolution
+     printf("Width Height = %d, %d\n", width, height);
      if(width >= 1024 && height >= 768)
      {
! 	if(!(bg = dmanager->CreateSprite("crskil17.jpg"))) return false;
!         bg->SetTextureRectangle(0,128, 1024, 768);
      }
      else if(width == 800 && height == 600)
      {
          if(!(bg = dmanager->CreateSprite("crskil86.jpg"))) return false;
!         bg->SetTextureRectangle(112,212, 800, 600);
      }
      else
      {
          if(!(bg = dmanager->CreateSprite("crskil64.jpg"))) return false;
!         bg->SetTextureRectangle(192,272, 640, 480);
      }