Changeset 5889

Timestamp:

Oct 6, 2009, 4:57:53 AM (15 years ago)

Author:

landauf

Message:

Using named events in Pong. Also firing events in PongBall now.

Location:

code/branches/core5/src/modules/pong

Files:

• Pong.cc (modified) (3 diffs)
• PongBall.cc (modified) (3 diffs)

code/branches/core5/src/modules/pong/Pong.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/EventIncludes.h"
 #include "core/Executor.h"
 #include "PongCenterpoint.h"
@@ -39 +40 @@
 namespace orxonox
 {
+    CreateEventName(PongCenterpoint, right);
+    CreateEventName(PongCenterpoint, left);
+    
     CreateUnloadableFactory(Pong);
 
@@ -155 +159 @@
         if (this->center_)
         {
-            this->center_->fireEvent();
-
+            if (player == this->getRightPlayer())
+                this->center_->fireEvent(EventName(PongCenterpoint, right));
+            else if (player == this->getLeftPlayer())
+                this->center_->fireEvent(EventName(PongCenterpoint, left));
+            
             if (player)
                 this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");

code/branches/core5/src/modules/pong/PongBall.cc

@@ -102 +102 @@
         {
             velocity.z = -velocity.z;
-            if (GameMode::playsSound())
-                this->sidesound_->play();
-
             if (position.z > this->fieldHeight_ / 2)
                 position.z = this->fieldHeight_ / 2;
             if (position.z < -this->fieldHeight_ / 2)
                 position.z = -this->fieldHeight_ / 2;
+
+            this->fireEvent();
+            if (GameMode::playsSound())
+                this->sidesound_->play();
         }
 
@@ -125 +126 @@
                         velocity.x = -velocity.x;
                         velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
+                        
+                        this->fireEvent();
                         if (GameMode::playsSound())
                             this->batsound_->play();
@@ -147 +150 @@
                         velocity.x = -velocity.x;
                         velocity.z = distance * distance * sgn(distance) * PongBall::MAX_REL_Z_VELOCITY * this->speed_;
+
+                        this->fireEvent();
                         if (GameMode::playsSound())
                             this->batsound_->play();