Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25480
Modified Files:
Tag: projectx
simulationserver_c.cpp
Log Message:
merge from HEAD
Index: simulationserver_c.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/simulationserver_c.cpp,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -d -r1.1.4.2 -r1.1.4.3
*** simulationserver_c.cpp 1 Jun 2007 15:20:23 -0000 1.1.4.2
--- simulationserver_c.cpp 17 Jun 2007 07:54:26 -0000 1.1.4.3
***************
*** 55,58 ****
--- 55,64 ----
}
+ FUNCTION(SimulationServer, resetTime)
+ {
+ obj->ResetTime();
+ return true;
+ }
+
FUNCTION(SimulationServer, setSimStep)
{
***************
*** 104,107 ****
--- 110,114 ----
DEFINE_FUNCTION(initControlNode);
DEFINE_FUNCTION(getTime);
+ DEFINE_FUNCTION(resetTime);
DEFINE_FUNCTION(setSimStep);
DEFINE_FUNCTION(getSimStep);
|
