[Gcblue-commits] gcb_wx/include/sim tcBallisticWeapon.h,1.1,1.2 tcSimState.h,1.26,1.27

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29425/include/sim

Modified Files:
	tcBallisticWeapon.h tcSimState.h 
Log Message:


Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** tcSimState.h	27 Jul 2004 00:16:23 -0000	1.26
--- tcSimState.h	29 Jul 2004 00:14:16 -0000	1.27
***************
*** 1,6 ****
! /*
  **  @file tcSimState.h
! **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
! /**
  **  @file tcSimState.h
! */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  

Index: tcBallisticWeapon.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcBallisticWeapon.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcBallisticWeapon.h	27 Jul 2004 23:26:06 -0000	1.1
--- tcBallisticWeapon.h	29 Jul 2004 00:14:16 -0000	1.2
***************
*** 29,33 ****
  namespace Database
  {
!     class tcWeaponDBObject;
  }
  
--- 29,33 ----
  namespace Database
  {
!     class tcBallisticDBObject;
  }
  
***************
*** 59,68 ****
      tcBallisticWeapon();
      tcBallisticWeapon(tcBallisticWeapon&);
!     tcBallisticWeapon(tcWeaponDBObject* obj);
  	~tcBallisticWeapon();
  protected:
  	float vz_mps;  ///< vertical velocity [m/s]
  	float vxy_mps; ///< lateral velocity [m/s]
  
  
  };
--- 59,70 ----
      tcBallisticWeapon();
      tcBallisticWeapon(tcBallisticWeapon&);
!     tcBallisticWeapon(tcBallisticDBObject* obj);
  	~tcBallisticWeapon();
  protected:
+ 	tcBallisticDBObject* mpDBObject;
  	float vz_mps;  ///< vertical velocity [m/s]
  	float vxy_mps; ///< lateral velocity [m/s]
  
+ 	float GetGunneryElevation(float range_m, float dz_m);
  
  };