Changeset 2839 for code/trunk/src/orxonox/objects/gametypes

Timestamp:

Mar 25, 2009, 3:26:06 AM (15 years ago)

Author:

landauf

Message:

added AI for the Pong gametype
improved Pong gameplay

Location:

code/trunk/src/orxonox/objects/gametypes

Files:

• Gametype.cc (modified) (2 diffs)
• Gametype.h (modified) (1 diff)
• Pong.cc (modified) (3 diffs)

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -200 +200 @@
                 // Reward killer
                 if (killer)
-                    this->playerScored(killer->getPlayer());
+                {
+                    std::map<PlayerInfo*, Player>::iterator it = this->players_.find(killer->getPlayer());
+                    if (it != this->players_.end())
+                        it->second.frags_++;
+                }
 
                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
@@ -348 +352 @@
     {
         for (unsigned int i = 0; i < amount; ++i)
-            new Bot(this);
+            this->botclass_.fabricate(this);
     }
 

code/trunk/src/orxonox/objects/gametypes/Gametype.h

@@ -142 +142 @@
             float initialStartCountdown_;
             unsigned int numberOfBots_;
+            SubclassIdentifier<Bot> botclass_;
 
             std::map<PlayerInfo*, Player> players_;

code/trunk/src/orxonox/objects/gametypes/Pong.cc

@@ -37 +37 @@
 #include "objects/worldentities/PongBall.h"
 #include "objects/worldentities/PongBat.h"
-#include "objects/infos/PlayerInfo.h"
+#include "objects/infos/HumanPlayer.h"
+#include "objects/infos/PongBot.h"
+#include "objects/controllers/PongAI.h"
 
 namespace orxonox
@@ -56 +58 @@
         this->starttimer_.setTimer(1.0, false, this, createExecutor(createFunctor(&Pong::startBall)));
         this->starttimer_.stopTimer();
+
+        this->botclass_ = Class(PongBot);
     }
 
@@ -133 +137 @@
             this->players_[player].state_ = PlayerState::Alive;
         }
+        else
+            return;
+
+        if (player && player->getController() && player->getController()->isA(Class(PongAI)))
+        {
+            PongAI* ai = dynamic_cast<PongAI*>(player->getController());
+            ai->setPongBall(this->ball_);
+        }
     }