Changeset 5831 for code/branches/core5/src/modules/overlays

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.

Location:

code/branches/core5/src/modules/overlays

Files:

• FadeoutText.cc (modified) (1 diff)
• FadeoutText.h (modified) (1 diff)
• hud/ChatOverlay.cc (modified) (1 diff)
• hud/UnderAttackHealthBar.cc (modified) (1 diff)
• hud/UnderAttackHealthBar.h (modified) (1 diff)

code/branches/core5/src/modules/overlays/FadeoutText.cc

@@ -46 +46 @@
 
         this->bFadingOut_ = false;
-        this->fadeouttimer_.setTimer(3.0f, false, this, createExecutor(createFunctor(&FadeoutText::fadeout)));
+        this->fadeouttimer_.setTimer(3.0f, false, createExecutor(createFunctor(&FadeoutText::fadeout, this)));
         this->fadeouttimer_.stopTimer();
 

code/branches/core5/src/modules/overlays/FadeoutText.h

@@ -68 +68 @@
 
             bool bFadingOut_;
-            Timer<FadeoutText> fadeouttimer_;
+            Timer fadeouttimer_;
 
             float initialAlpha_;

code/branches/core5/src/modules/overlays/hud/ChatOverlay.cc

@@ -87 +87 @@
         COUT(0) << "Chat: " << text << std::endl;
 
-        new Timer<ChatOverlay>(this->displayTime_, false, this, createExecutor(createFunctor(&ChatOverlay::dropMessage)), true);
+        new Timer(this->displayTime_, false, createExecutor(createFunctor(&ChatOverlay::dropMessage, this)), true);
 
         this->updateOverlayText();

code/branches/core5/src/modules/overlays/hud/UnderAttackHealthBar.cc

@@ -52 +52 @@
         this->text_->setPickPoint(Vector2(0.5, 0));
 
-        this->inittimer_.setTimer(0.0f, false, this, createExecutor(createFunctor(&UnderAttackHealthBar::init)));
+        this->inittimer_.setTimer(0.0f, false, createExecutor(createFunctor(&UnderAttackHealthBar::init, this)));
     }
 

code/branches/core5/src/modules/overlays/hud/UnderAttackHealthBar.h

@@ -62 +62 @@
             PlayerInfo* owner_;
             OverlayText* text_;
-            Timer<UnderAttackHealthBar> inittimer_;
+            Timer inittimer_;
     };
 }