Changeset 4223 in orxonox.OLD for orxonox/branches/physics/src/track_manager.h

Timestamp:

May 19, 2005, 7:45:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

File:

• orxonox/branches/physics/src/track_manager.h (modified) (1 diff)

orxonox/branches/physics/src/track_manager.h

@@ -167 +167 @@
   int setSavePoint(TrackElement* trackElem = NULL);
   void fork(unsigned int count, ...);
-  void forkV(unsigned int count, int* trackIDs, TrackElement* trackElem = NULL);
+  void forkS(unsigned int count, ...);
+  void forkS(const char* forkString);
+  void forkV(unsigned int count, int* trackIDs, char** trackNames, TrackElement* trackElem = NULL);
   void condition(unsigned int trackID, CONDITION cond, void* subject);
   void condition(CONDITION cond, void* subject, TrackElement* trackElem = NULL);
   void join(unsigned int count, ...);
-  void joinc(unsigned int count, ...);
+  void joinS(const char* joinString);
+  void joinS(unsigned int cound, ...);
   void joinV(unsigned int count, int* trackIDs);
   void finalize(void);