Changeset 7031 for code/branches/presentation3

Timestamp:

May 31, 2010, 4:42:57 AM (15 years ago)

Author:

landauf

Message:

merged dynamicmatch to presentation3

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• data/levels/gametype_dynamicmatch.oxw (copied) (copied from code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw) (1 prop)
• data/overlays/dynamicmatchhud.oxo (copied) (copied from code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo) (1 prop)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/GametypeFadingMessage.cc (copied) (copied from code/branches/dynamicmatch/src/modules/overlays/hud/GametypeFadingMessage.cc) (1 prop)
• src/modules/overlays/hud/GametypeFadingMessage.h (copied) (copied from code/branches/dynamicmatch/src/modules/overlays/hud/GametypeFadingMessage.h) (1 prop)
• src/modules/overlays/hud/GametypeStaticMessage.cc (copied) (copied from code/branches/dynamicmatch/src/modules/overlays/hud/GametypeStaticMessage.cc) (1 prop)
• src/modules/overlays/hud/GametypeStaticMessage.h (copied) (copied from code/branches/dynamicmatch/src/modules/overlays/hud/GametypeStaticMessage.h) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/controllers/ArtificialController.cc (modified) (2 diffs)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/Dynamicmatch.cc (copied) (copied from code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc)
• src/orxonox/gametypes/Dynamicmatch.h (copied) (copied from code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.h)
• src/orxonox/infos/GametypeInfo.cc (modified) (3 diffs)
• src/orxonox/infos/GametypeInfo.h (modified) (1 diff)
• src/orxonox/interfaces/GametypeMessageListener.h (modified) (1 diff)

code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h

@@ -78 +78 @@
     class ChatOverlay;
     class DeathMessage;
+    class GametypeFadingMessage;
+    class GametypeStaticMessage;
     class GametypeStatus;
     class HUDBar;

code/branches/presentation3/src/modules/overlays/hud/CMakeLists.txt

@@ -13 +13 @@
   UnderAttackHealthBar.cc
   TeamBaseMatchScore.cc
+  GametypeStaticMessage.cc
+  GametypeFadingMessage.cc
 )

code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h

@@ -90 +90 @@
     class Asteroids;
     class Deathmatch;
+    class Dynamicmatch;
     class Gametype;
     class TeamBaseMatch;

code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc

@@ -34 +34 @@
 #include "worldentities/pawns/TeamBaseMatchBase.h"
 #include "gametypes/TeamDeathmatch.h"
+#include "gametypes/Dynamicmatch.h"
 #include "controllers/WaypointPatrolController.h"
 
@@ -245 +246 @@
         }
 
+        Dynamicmatch* dynamic = orxonox_cast<Dynamicmatch*>(gametype);
+        if (dynamic)
+        {
+            if (dynamic->notEnoughPigs||dynamic->notEnoughKillers||dynamic->notEnoughChasers) {return false;}
+
+            if (entity1->getPlayer())
+                team1 = dynamic->getParty(entity1->getPlayer());
+
+            if (entity2->getPlayer())
+                team2 = dynamic->getParty(entity2->getPlayer());
+
+            if (team1 ==-1 ||team2 ==-1 ) {return false;}
+            else if (team1 == dynamic->chaser && team2 != dynamic->chaser) {return false;}
+            else if (team1 == dynamic->piggy && team2 == dynamic->chaser) {return false;}
+            else if (team1 == dynamic->killer && team2 == dynamic->chaser) {return false;}
+            else return true;
+        }
+
         return (team1 == team2 && team1 != -1);
     }

code/branches/presentation3/src/orxonox/gametypes/CMakeLists.txt

@@ -6 +6 @@
   UnderAttack.cc
   Asteroids.cc
+  Dynamicmatch.cc
 )

code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc

@@ -42 +42 @@
     registerMemberNetworkFunction(GametypeInfo, dispatchKillMessage);
     registerMemberNetworkFunction(GametypeInfo, dispatchDeathMessage);
+    registerMemberNetworkFunction(GametypeInfo, dispatchStaticMessage);
+    registerMemberNetworkFunction(GametypeInfo, dispatchFadingMessage);
 
     GametypeInfo::GametypeInfo(BaseObject* creator) : Info(creator)
@@ -110 +112 @@
     }
 
+    void GametypeInfo::sendStaticMessage(const std::string& message, unsigned int clientID)
+    {
+        if (GameMode::isMaster())
+        {
+            if (clientID == CLIENTID_SERVER)
+                this->dispatchStaticMessage(message);
+            else
+                callMemberNetworkFunction(GametypeInfo, dispatchStaticMessage, this->getObjectID(), clientID, message);
+        }
+    }
+
+    void GametypeInfo::sendFadingMessage(const std::string& message, unsigned int clientID)
+    {
+        if (GameMode::isMaster())
+        {
+            if (clientID == CLIENTID_SERVER)
+                this->dispatchFadingMessage(message);
+            else
+                callMemberNetworkFunction(GametypeInfo, dispatchFadingMessage, this->getObjectID(), clientID, message);
+        }
+    }
+
     void GametypeInfo::dispatchAnnounceMessage(const std::string& message)
     {
@@ -127 +151 @@
             it->deathmessage(this, message);
     }
+
+     void GametypeInfo::dispatchStaticMessage(const std::string& message)
+    {
+        for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
+            it->staticmessage(this, message);
+    }
+    
+     void GametypeInfo::dispatchFadingMessage(const std::string& message)
+    {
+        for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
+            it->fadingmessage(this, message);
+    }
 }

code/branches/presentation3/src/orxonox/infos/GametypeInfo.h

@@ -64 +64 @@
             void sendKillMessage(const std::string& message, unsigned int clientID);
             void sendDeathMessage(const std::string& message, unsigned int clientID);
+            void sendStaticMessage(const std::string& message, unsigned int clientID);
+            void sendFadingMessage(const std::string& message, unsigned int clientID);
 
             void dispatchAnnounceMessage(const std::string& message);
             void dispatchKillMessage(const std::string& message);
             void dispatchDeathMessage(const std::string& message);
+            void dispatchStaticMessage(const std::string& message);
+            void dispatchFadingMessage(const std::string& message);
 
         private:

code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h

@@ -44 +44 @@
             virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) {}
             virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) {}
+            virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message) {}
+            virtual void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) {}
     };
 }