[Gcblue-commits] gcb_wx/src/sim tcControllableObject.cpp, 1.4, 1.5 tcSensorMap.cpp, 1.27, 1.28

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

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

Modified Files:
	tcControllableObject.cpp tcSensorMap.cpp 
Log Message:


Index: tcSensorMap.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSensorMap.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tcSensorMap.cpp	20 Nov 2006 00:17:45 -0000	1.27
--- tcSensorMap.cpp	29 Nov 2006 02:51:44 -0000	1.28
***************
*** 443,447 ****
      if (nMapIdx == -1) 
      {
!         fprintf(stderr, "Bad alliance passed to sensormap (%d)\n", anAlliance);
          return NULL;
      }
--- 443,447 ----
      if (nMapIdx == -1) 
      {
!         fprintf(stderr, "Bad alliance passed to sensormap (%d, nMaps: %d)\n", anAlliance, mnMaps);
          return NULL;
      }
***************
*** 476,490 ****
  int tcSensorMap::GetTrackCount(UINT8 anAlliance) 
  {
!     tcAllianceSensorMap *pMap = GetMap(anAlliance);
!     if (pMap == NULL) {return 0;}
!     return pMap->GetTrackCount();
  }
! tnPoolIndex tcSensorMap::GetStartTrackPosition(UINT8 anAlliance) {
!     tcAllianceSensorMap *pMap = GetMap(anAlliance);
!     return pMap->GetStartTrackPosition();
  }
! void tcSensorMap::GetNextTrack(tnPoolIndex& pos, tcSensorMapTrack*& pTrack, UINT8 anAlliance) {
!     tcAllianceSensorMap *pMap = GetMap(anAlliance);
!     return pMap->GetNextTrack(pos, pTrack);
  }
  
--- 476,510 ----
  int tcSensorMap::GetTrackCount(UINT8 anAlliance) 
  {
!     if (tcAllianceSensorMap *pMap = GetMap(anAlliance))
!     {
!         return pMap->GetTrackCount();
!     }
!     else
!     {
!         return 0;
!     }
  }
! tnPoolIndex tcSensorMap::GetStartTrackPosition(UINT8 anAlliance) 
! {
!     if (tcAllianceSensorMap *pMap = GetMap(anAlliance))
!     {
!         return pMap->GetStartTrackPosition();
!     }
!     else
!     {
!         return -1;
!     }
  }
! void tcSensorMap::GetNextTrack(tnPoolIndex& pos, tcSensorMapTrack*& pTrack, UINT8 anAlliance) 
! {
!     if (tcAllianceSensorMap *pMap = GetMap(anAlliance))
!     {
!         return pMap->GetNextTrack(pos, pTrack);
!     }
!     else
!     {
!         pos = -1;
!         pTrack = 0;
!     }
  }
  

Index: tcControllableObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcControllableObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcControllableObject.cpp	28 Nov 2006 01:57:37 -0000	1.4
--- tcControllableObject.cpp	29 Nov 2006 02:51:44 -0000	1.5
***************
*** 46,50 ****
  void tcControllableObject::SetBypassControlCheck(bool state)
  {
! 	bypassControlCheck = true;
  }
  
--- 46,50 ----
  void tcControllableObject::SetBypassControlCheck(bool state)
  {
! 	bypassControlCheck = state;
  }