simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/oxygen/gamecontrolserver

Modified Files:
	gamecontrolserver.cpp gamecontrolserver.h predicate.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: gamecontrolserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gamecontrolserver.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- gamecontrolserver.cpp	15 Mar 2007 07:26:27 -0000	1.2
***************
*** 206,210 ****
      // the real thing should query the AgentAspect corresponding to
      // the agent.
!     return 0.2;
  }
  
--- 206,210 ----
      // the real thing should query the AgentAspect corresponding to
      // the agent.
!     return 0.2f;
  }
  
***************
*** 214,218 ****
      // the real thing should query the AgentAspect corresponding to
      // the agent
!     return 0.1;
  }
  
--- 214,218 ----
      // the real thing should query the AgentAspect corresponding to
      // the agent
!     return 0.1f;
  }
  
***************
*** 222,226 ****
      // the real thing should query the AgentAspect corresponding to
      // the agent.
!     return 0.1;
  }
  
--- 222,232 ----
      // the real thing should query the AgentAspect corresponding to
      // the agent.
!     return 0.1f;
! }
! 
! int
! GameControlServer::GetAgentCount() const
! {
!     return mAgentMap.size();
  }
  

Index: predicate.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/predicate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** predicate.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- predicate.cpp	15 Mar 2007 07:26:27 -0000	1.2
***************
*** 208,212 ****
  int PredicateList::GetSize() const
  {
!     return mList.size();
  }
  
--- 208,212 ----
  int PredicateList::GetSize() const
  {
!     return static_cast<int>(mList.size());
  }
  

Index: gamecontrolserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gamecontrolserver.h	5 Dec 2005 21:16:49 -0000	1.1
--- gamecontrolserver.h	15 Mar 2007 07:26:27 -0000	1.2
***************
*** 101,104 ****
--- 101,109 ----
      float GetActionLatency(int id);
  
+     /** returns the number of agents currently connected
+         to the simulator
+     */
+     int GetAgentCount() const;
+ 
      /** returns the AgentAspect for the given \param id */
      boost::shared_ptr<AgentAspect> GetAgentAspect(int id);