[Csp-commits] APPLICATIONS/CSPSim/Source Sky.cpp,1.8,1.9 CSPSim.cpp,1.17,1.18

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

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

Modified Files:
	Sky.cpp CSPSim.cpp 
Log Message:
see CHANGES.current

Index: Sky.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Sky.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Sky.cpp	21 Mar 2003 20:07:57 -0000	1.8
--- Sky.cpp	11 Apr 2003 18:59:20 -0000	1.9
***************
*** 184,188 ****
  		simdata::DataArchive *archive = CSPSim::theSim->getDataArchive();	
  		assert(archive);
! 		_catalog = archive->getObject("environment.stars");
  		assert(_catalog.valid());
  		int n = _catalog->_stars.size();
--- 184,188 ----
  		simdata::DataArchive *archive = CSPSim::theSim->getDataArchive();	
  		assert(archive);
! 		_catalog = archive->getObject("sim:environment.stars");
  		assert(_catalog.valid());
  		int n = _catalog->_stars.size();

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CSPSim.cpp	3 Apr 2003 10:40:42 -0000	1.17
--- CSPSim.cpp	11 Apr 2003 18:59:20 -0000	1.18
***************
*** 185,189 ****
  
  	std::string data_path = g_Config.getPath("Paths", "DataPath", ".", true);
! 	std::string archive_file = ospath::join(data_path, "Sim.dar");
  	
  	// open the primary data archive
--- 185,189 ----
  
  	std::string data_path = g_Config.getPath("Paths", "DataPath", ".", true);
! 	std::string archive_file = ospath::join(data_path, "sim.dar");
  	
  	// open the primary data archive
***************
*** 225,229 ****
  
  	// eventually this will be set in an entirely different way...
! 	m_ActiveTerrain = m_DataArchive->getObject("terrain.balkan");
  	m_ActiveTerrain->activate(m_Battlefield);
  	
--- 225,229 ----
  
  	// eventually this will be set in an entirely different way...
! 	m_ActiveTerrain = m_DataArchive->getObject("sim:terrain.balkan");
  	m_ActiveTerrain->activate(m_Battlefield);
  	
***************
*** 242,246 ****
  
  	// create a couple test objects
! 	simdata::Pointer<AircraftObject> ao = m_DataArchive->getObject("vehicles.aircraft.m2k");
  	assert(ao.valid());
  	//ao->setGlobalPosition(483000, 499000, 2000);
--- 242,246 ----
  
  	// create a couple test objects
! 	simdata::Pointer<AircraftObject> ao = m_DataArchive->getObject("sim:vehicles.aircraft.m2k");
  	assert(ao.valid());
  	//ao->setGlobalPosition(483000, 499000, 2000);
***************
*** 253,257 ****
  	
  	/*
! 	simdata::Pointer<DynamicObject> to = m_DataArchive->getObject("vehicles.aircraft.m2k");
  	assert(to.valid());
  	to->setGlobalPosition(483000, 501000, 0);
--- 253,257 ----
  	
  	/*
! 	simdata::Pointer<DynamicObject> to = m_DataArchive->getObject("sim:vehicles.aircraft.m2k");
  	assert(to.valid());
  	to->setGlobalPosition(483000, 501000, 0);