Changeset 5831 for code/branches/core5/src/orxonox/gametypes/TeamBaseMatch.h

Timestamp:

Sep 28, 2009, 10:48:47 PM (15 years ago)

Author:

landauf

Message:

Realized Timer doesn't have to be a template, hence merged TimerBase, Timer and StaticTimer.
Removed the object pointer from Timer for memberfunctions, use createFunctor(f, object) instead.

File:

• code/branches/core5/src/orxonox/gametypes/TeamBaseMatch.h (modified) (1 diff)

code/branches/core5/src/orxonox/gametypes/TeamBaseMatch.h

@@ -65 +65 @@
 
             std::set<TeamBaseMatchBase*> bases_;
-            Timer<TeamBaseMatch> scoreTimer_;
-            Timer<TeamBaseMatch> outputTimer_;
+            Timer scoreTimer_;
+            Timer outputTimer_;
 
             //points for each team