[Planeshift-cvs] CVS: planeshift/src/setup pssetup.cpp,1.19,1.20 pawsskinwindow.cpp,1.14,1.15 pawssetupwindow.cpp,1.29,1.30

[Xordan <mg...@us...>]

Update of /cvsroot/planeshift/planeshift/src/setup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4811/src/setup

Modified Files:
	pssetup.cpp pawsskinwindow.cpp pawssetupwindow.cpp 
Log Message:
-- Changed a few vfs /this/ into /planeshift/ for consistency. (Should we be using /planeshift/ more generally?)
- Took skin path out of code and put into psclient.cfg as Planeshift.GUI.Skin.Dir.

Index: pssetup.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/setup/pssetup.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pssetup.cpp	28 Apr 2006 17:39:38 -0000	1.19
--- pssetup.cpp	29 Apr 2006 22:58:57 -0000	1.20
***************
*** 148,152 ****
  
      // Load and assign a default button click sound for pawsbutton
!     paws->LoadSound("/this/art/music/gui/ccreate/next.wav","sound.standardButtonClick");
  
      if (!LoadWidgets())
--- 148,152 ----
  
      // Load and assign a default button click sound for pawsbutton
!     paws->LoadSound("/planeshift/art/music/gui/ccreate/next.wav","sound.standardButtonClick");
  
      if (!LoadWidgets())

Index: pawsskinwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/setup/pawsskinwindow.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pawsskinwindow.cpp	28 Apr 2006 17:34:50 -0000	1.14
--- pawsskinwindow.cpp	29 Apr 2006 22:58:57 -0000	1.15
***************
*** 54,58 ****
  
      // Fill the skins
!     csString root = "/this/art/skins/";
      csRef<iStringArray> files = vfs->FindFiles(root);
      for(size_t i = 0; i < files->Length();i++)
--- 54,58 ----
  
      // Fill the skins
!     csString root = "/planeshift/art/skins/";
      csRef<iStringArray> files = vfs->FindFiles(root);
      for(size_t i = 0; i < files->Length();i++)
***************
*** 69,75 ****
  
      // Load the current skin
!     config = new csConfigFile("/this/psclient.cfg", vfs);
  
!     csString skin = config->GetStr("Planeshift.GUI.Skin.Ingame");
      if(!strcmp(skin,""))
          return true; // Stop here, but it's ok
--- 69,75 ----
  
      // Load the current skin
!     config = new csConfigFile("/planeshift/psclient.cfg", vfs);
  
!     csString skin = config->GetStr("Planeshift.GUI.Skin.Ingame");	
      if(!strcmp(skin,""))
          return true; // Stop here, but it's ok
***************
*** 87,96 ****
  void pawsSkinWindow::LoadSkin(const char* name)
  {
!     csString zip;
!     zip += "/this/art/skins/";
      zip += name;
      zip += ".zip";
  
!     //const char *zip = "/this/art/skins/cvs.zip";
      if( !vfs->Exists( zip ) )
      {
--- 87,100 ----
  void pawsSkinWindow::LoadSkin(const char* name)
  {
!     // Get path to skins.	
! 	csString skinpath = config->GetStr("Planeshift.GUI.Skin.Dir");
! 	
! 	// Create full path to skin.
!     csString zip;	
! 	zip += skinpath;
      zip += name;
      zip += ".zip";
  
!     //const char *zip = "/planeshift/art/skins/cvs.zip";
      if( !vfs->Exists( zip ) )
      {

Index: pawssetupwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/setup/pawssetupwindow.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** pawssetupwindow.cpp	28 Apr 2006 17:34:50 -0000	1.29
--- pawssetupwindow.cpp	29 Apr 2006 22:58:57 -0000	1.30
***************
*** 149,154 ****
      csRef<iVFS> vfs = CS_QUERY_REGISTRY (PawsManager::GetSingleton().GetObjectRegistry(), iVFS);
     
!     configClient = new csConfigFile("/this/psclient.cfg", vfs);
!     configGlobal = new csConfigFile("/this/planeshift.cfg", vfs);
  
      rbgResolution= (pawsRadioButtonGroup*)FindWidget("resbox");
--- 149,154 ----
      csRef<iVFS> vfs = CS_QUERY_REGISTRY (PawsManager::GetSingleton().GetObjectRegistry(), iVFS);
     
!     configClient = new csConfigFile("/planeshift/psclient.cfg", vfs);
!     configGlobal = new csConfigFile("/planeshift/planeshift.cfg", vfs);
  
      rbgResolution= (pawsRadioButtonGroup*)FindWidget("resbox");