[Csp-commits] APPLICATIONS/CSPSim/Include CSPSim.h,1.1.2.1,1.1.2.2 EventMapping.h,1.1.2.1,1.1.2.2 GameScreen.h,1.1.2.1,1.1.2.2 SimObject.h,1.1.2.1,1.1.2.2 SimpleConfig.h,1.1.2.1,1.1.2.2 VehicleModel.h,1.1.2.1,1.1.2.2 compiler.h,1.1.2.1,1.1.2.2

[<de...@us...>]

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

Modified Files:
      Tag: simdata
	CSPSim.h EventMapping.h GameScreen.h SimObject.h 
	SimpleConfig.h VehicleModel.h compiler.h 
Log Message:
no message

Index: CSPSim.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/CSPSim.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CSPSim.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- CSPSim.h	2 Feb 2003 15:52:21 -0000	1.1.2.2
***************
*** 28,32 ****
  #define __CSPSIM_H__
  
! 
  #include "TerrainObject.h"
  
--- 28,32 ----
  #define __CSPSIM_H__
  
! #include "DynamicObject.h"
  #include "TerrainObject.h"
  
***************
*** 36,44 ****
  #include <SimData/Types.h>
  
- 
- class DynamicObject;
  class VirtualBattlefield;
  class VirtualHID;
- class DynamicObject;
  class BaseScreen;
  class GameScreen;
--- 36,41 ----

Index: EventMapping.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/EventMapping.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** EventMapping.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- EventMapping.h	2 Feb 2003 15:52:21 -0000	1.1.2.2
***************
*** 27,30 ****
--- 27,34 ----
  #define __EVENTMAPPING_H__
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4786)
+ # endif
+ 
  #include "SDL_events.h"
  #include "SDL_keysym.h"

Index: GameScreen.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/GameScreen.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** GameScreen.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- GameScreen.h	2 Feb 2003 15:52:21 -0000	1.1.2.2
***************
*** 26,29 ****
--- 26,32 ----
  #define __GAMESCREEN_H__
  
+ #include <SimData/Math.h>
+ #include <SimData/Vector3.h>
+ 
  #include "BaseScreen.h"
  //#include "SDL_keysym.h"
***************
*** 32,36 ****
  #include "HID.h"
  
! #include <SimData/Vector3.h>
  
  class VirtualBattlefield;
--- 35,39 ----
  #include "HID.h"
  
! 
  
  class VirtualBattlefield;
***************
*** 122,127 ****
  
  	void NormalView();
! 	void TurnViewAboutX(double fangleMax = M_PI / 2);
! 	void TurnViewAboutZ(double fangleMax = M_PI);
  	void ScaleView();
  	simdata::Vector3 GetNewFixedCamPos(SimObject * const target) const;
--- 125,130 ----
  
  	void NormalView();
! 	void TurnViewAboutX(double fangleMax = G_PI / 2);
! 	void TurnViewAboutZ(double fangleMax = G_PI);
  	void ScaleView();
  	simdata::Vector3 GetNewFixedCamPos(SimObject * const target) const;

Index: SimObject.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimObject.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimObject.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- SimObject.h	2 Feb 2003 15:52:21 -0000	1.1.2.2
***************
*** 51,59 ****
  public:
  
  	BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(SimObject)
  		SIMDATA_XML("model", SimObject::m_Model, true)
  		SIMDATA_XML("army", SimObject::m_Army, true)
  	END_SIMDATA_XML_INTERFACE
! 
  
  	SimObject();
--- 51,60 ----
  public:
  
+ 	
  	BEGIN_SIMDATA_XML_VIRTUAL_INTERFACE(SimObject)
  		SIMDATA_XML("model", SimObject::m_Model, true)
  		SIMDATA_XML("army", SimObject::m_Army, true)
  	END_SIMDATA_XML_INTERFACE
!     
  
  	SimObject();

Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimpleConfig.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- SimpleConfig.h	2 Feb 2003 15:52:22 -0000	1.1.2.2
***************
*** 33,36 ****
--- 33,41 ----
  #define __SIMPLECONFIG_H__
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4786)
+ # endif
+ 
+ 
  #include <string>
  #include <vector>
***************
*** 142,147 ****
  class HashString {
  public:
! 	bool operator()(std::string const &str) const {
! 		return HASH<char const *>()(str.c_str());
  	}
  };
--- 147,153 ----
  class HashString {
  public:
! 	unsigned int operator()(std::string const &str) const {
! 	//bool operator()(std::string const &str) const {
! 		return (HASH<char const *>()(str.c_str()));
  	}
  };

Index: VehicleModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/VehicleModel.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** VehicleModel.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- VehicleModel.h	2 Feb 2003 15:52:22 -0000	1.1.2.2
***************
*** 85,89 ****
  
  	void pack(simdata::Packer &p) const {
! 		vehicle::System::pack(p);
  		p.pack(m_Center);
  		p.pack(m_Width);
--- 85,89 ----
  
  	void pack(simdata::Packer &p) const {
! 		System::pack(p);
  		p.pack(m_Center);
  		p.pack(m_Width);
***************
*** 92,96 ****
  
  	void unpack(simdata::UnPacker &p) {
! 		vehicle::System::unpack(p);
  		p.unpack(m_Center);
  		p.unpack(m_Width);
--- 92,96 ----
  
  	void unpack(simdata::UnPacker &p) {
! 		System::unpack(p);
  		p.unpack(m_Center);
  		p.unpack(m_Width);
***************
*** 189,198 ****
  	
  	void pack(simdata::Packer &p) const {
! 		vehicle::Model::pack(p);
  		p.pack(m_HUD);
  	}
  
  	void unpack(simdata::UnPacker &p) {
! 		vehicle::Model::unpack(p);
  		p.unpack(m_HUD);
  		m_HUD->bind(this);
--- 189,198 ----
  	
  	void pack(simdata::Packer &p) const {
! 		Model::pack(p);
  		p.pack(m_HUD);
  	}
  
  	void unpack(simdata::UnPacker &p) {
! 		Model::unpack(p);
  		p.unpack(m_HUD);
  		m_HUD->bind(this);

Index: compiler.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/compiler.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** compiler.h	26 Jan 2003 23:15:55 -0000	1.1.2.1
--- compiler.h	2 Feb 2003 15:52:22 -0000	1.1.2.2
***************
*** 228,232 ****
--- 228,236 ----
  #    define STL_STRING     <string>
  #    define STL_STRSTREAM  <strstream>
+ #if !defined(_STLP_WIN32) 
  #    define STL_SSTREAM    STL_STRSTREAM
+ #else
+ #    define STL_SSTREAM    <sstream>
+ #endif 
  
  #    pragma warning(disable: 4786) // identifier was truncated to '255' characters