[Csp-commits] APPLICATIONS/CSPSim/Source LogoScreen.cpp,1.4,1.5 TerrainObject.cpp,1.5,1.6 VirtualBattlefield.cpp,1.5,1.6

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

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

Modified Files:
	LogoScreen.cpp TerrainObject.cpp VirtualBattlefield.cpp 
Log Message:
missed a few bugs related to the new data path config code that had been committed to cvs earlier

Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LogoScreen.cpp	16 Feb 2003 09:48:59 -0000	1.4
--- LogoScreen.cpp	19 Feb 2003 12:25:23 -0000	1.5
***************
*** 39,42 ****
--- 39,43 ----
  #include "LogoScreen.h"
  #include "Platform.h"
+ #include "Config.h"
  
  
***************
*** 55,59 ****
  {
  	std::string image_path = g_Config.getPath("Paths", "ImagePath", ".", true);
! 	std::string path = ospath.join(image_path, "CSPLogo.bmp");
  	m_image = SDL_LoadBMP(path.c_str());
  	if (m_image == NULL)
--- 56,60 ----
  {
  	std::string image_path = g_Config.getPath("Paths", "ImagePath", ".", true);
! 	std::string path = ospath::join(image_path, "CSPLogo.bmp");
  	m_image = SDL_LoadBMP(path.c_str());
  	if (m_image == NULL)

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TerrainObject.cpp	19 Feb 2003 11:41:58 -0000	1.5
--- TerrainObject.cpp	19 Feb 2003 12:25:23 -0000	1.6
***************
*** 3,6 ****
--- 3,7 ----
  #include <osg/StateSet>
  
+ #include "Config.h"
  #include "LogStream.h"
  #include "Platform.h"

Index: VirtualBattlefield.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualBattlefield.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VirtualBattlefield.cpp	19 Feb 2003 11:41:58 -0000	1.5
--- VirtualBattlefield.cpp	19 Feb 2003 12:25:23 -0000	1.6
***************
*** 198,202 ****
  	ospath::addpath(search_path, model_path);
  	ospath::addpath(search_path, font_path);
! 	osgDB::setDataFilePathList(searchpath);
  
  	// we don't need this on Linux since libs are usually
--- 198,202 ----
  	ospath::addpath(search_path, model_path);
  	ospath::addpath(search_path, font_path);
! 	osgDB::setDataFilePathList(search_path);
  
  	// we don't need this on Linux since libs are usually