[Gcblue-commits] gcb_wx/src/database tcDatabase.cpp,1.24,1.25 tcMissileDBObject.cpp,1.15,1.16

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

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30838/src/database

Modified Files:
	tcDatabase.cpp tcMissileDBObject.cpp 
Log Message:
0.7.0 release snapshot

Index: tcMissileDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcMissileDBObject.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcMissileDBObject.cpp	7 Dec 2004 04:00:28 -0000	1.15
--- tcMissileDBObject.cpp	29 Mar 2005 00:12:26 -0000	1.16
***************
*** 71,77 ****
      primarySeekerKey = database->GetKey(maSensorClass[0]);
  
!     if (primarySeekerKey == NULL_INDEX)
      {
!         std::cerr << "tcMissileDBObject::GetPrimarySeekerKey -- not found" << std::endl;
      }
      return primarySeekerKey;
--- 71,79 ----
      primarySeekerKey = database->GetKey(maSensorClass[0]);
  
!     // do not report error for missiles with no sensor (e.g. some AGMs)
!     if ((primarySeekerKey == NULL_INDEX) && (strlen(maSensorClass[0].mz) > 0))
      {
!         fprintf(stderr, "tcMissileDBObject::GetPrimarySeekerKey -- not found "
!             "(%s)\n", maSensorClass[0].mz);
      }
      return primarySeekerKey;
***************
*** 90,98 ****
  	unsigned int nEmitters = emitters.size();
  
  	for (unsigned int k=0; k<nEmitters; k++)
  	{
  		long emitterId = emitters[k];
  
! 		if (primarySeekerKey != emitterId) return false;
  	}
  	return true;
--- 92,102 ----
  	unsigned int nEmitters = emitters.size();
  
+     long seekerKey = GetPrimarySeekerKey();
+ 
  	for (unsigned int k=0; k<nEmitters; k++)
  	{
  		long emitterId = emitters[k];
  
! 		if (seekerKey != emitterId) return false;
  	}
  	return true;
***************
*** 596,601 ****
     mfRange_km = 123.4f;
     // sensor info
!    maSensorClass[0] = "none";
!    maSensorClass[1] = "none";
     // flight profile, array of flight segment info
     mnNumSegments = 1;
--- 600,605 ----
     mfRange_km = 123.4f;
     // sensor info
!    maSensorClass[0] = "";
!    maSensorClass[1] = "";
     // flight profile, array of flight segment info
     mnNumSegments = 1;

Index: tcDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcDatabase.cpp	5 Mar 2005 22:37:51 -0000	1.24
--- tcDatabase.cpp	29 Mar 2005 00:12:26 -0000	1.25
***************
*** 681,686 ****
     pmissile->mfRange_km = 123.4f;
     // sensor info
!    pmissile->maSensorClass[0] = "none";
!    pmissile->maSensorClass[1] = "none";
     // flight profile, array of flight segment info
     pmissile->mnNumSegments = 1;
--- 681,686 ----
     pmissile->mfRange_km = 123.4f;
     // sensor info
!    pmissile->maSensorClass[0] = "";
!    pmissile->maSensorClass[1] = "";
     // flight profile, array of flight segment info
     pmissile->mnNumSegments = 1;