csp-commits

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv11807/Source

Modified Files:
	LogoScreen.cpp Platform.cpp 
Log Message:
a little more path cleanup

Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/LogoScreen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LogoScreen.cpp	14 Dec 2002 18:55:36 -0000	1.4
--- LogoScreen.cpp	15 Dec 2002 01:39:19 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  
  #include "LogoScreen.h"
+ #include "Platform.h"
  
  
***************
*** 15,22 ****
  void LogoScreen::OnInit()
  {
!     m_image = SDL_LoadBMP("../Data/Images/CSPLogo.bmp");
      if (m_image == NULL)
      {
!         printf("Unable to load bitmap ../Data/Images/CSPLogo.bmp\n");
      }
  
--- 16,24 ----
  void LogoScreen::OnInit()
  {
!     std::string path = OSPath::filter("../Data/Images/CSPLogo.bmp");
!     m_image = SDL_LoadBMP(path.c_str());
      if (m_image == NULL)
      {
!         cout << "Unable to load bitmap " << path << endl;
      }
  

Index: Platform.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPFlightSim/Source/Platform.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Platform.cpp	15 Dec 2002 00:48:45 -0000	1.3
--- Platform.cpp	15 Dec 2002 01:39:19 -0000	1.4
***************
*** 131,135 ****
  	std::string::size_type idx;
  	idx = a.length();
! 	if (idx > 0 && a[idx-1] == DIR_SEPARATOR) idx--;
  	result = a.substr(0, idx);
  	return result + DIR_SEPARATOR + skiproot(b);
--- 131,135 ----
  	std::string::size_type idx;
  	idx = a.length();
! 	if (idx > 0 && (a[idx-1] == '/' || a[idx-1] == '\\')) idx--;
  	result = a.substr(0, idx);
  	return result + DIR_SEPARATOR + skiproot(b);