[Gcblue-commits] gcb_wx/src/sim tcMissileObject.cpp,1.30,1.31

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

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

Modified Files:
	tcMissileObject.cpp 
Log Message:


Index: tcMissileObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMissileObject.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tcMissileObject.cpp	14 Jul 2005 23:42:23 -0000	1.30
--- tcMissileObject.cpp	17 Jul 2005 12:58:05 -0000	1.31
***************
*** 213,218 ****
  	msKState.mfPitch_rad = mcKin.mfPitch_rad;
  
!     wxString s = wxString::Format("Missile %d-%d", obj->mnID, rand() % 1000);
!     mzUnit = s.c_str();      
  
  	SetAlliance(obj->GetAlliance());     
--- 213,229 ----
  	msKState.mfPitch_rad = mcKin.mfPitch_rad;
  
!     wxString s = wxString::Format("Missile %d-%d", obj->mnID, rand() % 10000);
!   
! 	/* Workaround, for some reason duplicate names were appearing with missiles
! 	** despite statistical unlikelihood. E.g. Missile 11-133 showed up three times!?
! 	** Changed from 3 to 4 digit random suffix and added test and second chance to 
! 	** get a unique object name.
! 	*/
! 	if (simState->GetObjectByName(s.c_str()))
! 	{
!         s = wxString::Format("Missile %d-%d", obj->mnID, rand() % 10000);
! 	}
! 
!     mzUnit = s.c_str();   
  
  	SetAlliance(obj->GetAlliance());