Changeset 3196 for code/trunk/src/orxonox/objects/infos

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/infos/Bot.cc (modified) (3 diffs)
• src/orxonox/objects/infos/Bot.h (modified) (1 diff)
• src/orxonox/objects/infos/GametypeInfo.cc (modified) (8 diffs)
• src/orxonox/objects/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/objects/infos/HumanPlayer.cc (modified) (2 diffs)
• src/orxonox/objects/infos/HumanPlayer.h (modified) (1 diff)
• src/orxonox/objects/infos/Info.cc (modified) (1 diff)
• src/orxonox/objects/infos/PlayerInfo.cc (modified) (1 diff)
• src/orxonox/objects/infos/PongBot.h (modified) (1 diff)

code/trunk/src/orxonox/objects/infos/Bot.cc

@@ -29 +29 @@
 #include "Bot.h"
 
+#include "util/Math.h"
 #include "core/GameMode.h"
 #include "core/CoreIncludes.h"
@@ -34 +35 @@
 #include "objects/gametypes/Gametype.h"
 #include "objects/controllers/AIController.h"
-#include "util/Math.h"
 
 namespace orxonox
@@ -66 +66 @@
     void Bot::setConfigValues()
     {
-        static std::string names[] =
+        static const std::string names[] =
         {
             "Dr. Julius No",

code/trunk/src/orxonox/objects/infos/Bot.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
 #include <vector>
-
 #include "PlayerInfo.h"
 

code/trunk/src/orxonox/objects/infos/GametypeInfo.cc

@@ -33 +33 @@
 #include "network/NetworkFunction.h"
 #include "network/Host.h"
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
 
 namespace orxonox
@@ -68 +68 @@
     }
 
-    void GametypeInfo::sendAnnounceMessage(const std::string& message) const
+    void GametypeInfo::sendAnnounceMessage(const std::string& message)
     {
         if (GameMode::isMaster())
@@ -77 +77 @@
     }
 
-    void GametypeInfo::sendAnnounceMessage(const std::string& message, unsigned int clientID) const
+    void GametypeInfo::sendAnnounceMessage(const std::string& message, unsigned int clientID)
     {
         if (GameMode::isMaster())
@@ -88 +88 @@
     }
 
-    void GametypeInfo::sendKillMessage(const std::string& message, unsigned int clientID) const
+    void GametypeInfo::sendKillMessage(const std::string& message, unsigned int clientID)
     {
         if (GameMode::isMaster())
@@ -99 +99 @@
     }
 
-    void GametypeInfo::sendDeathMessage(const std::string& message, unsigned int clientID) const
+    void GametypeInfo::sendDeathMessage(const std::string& message, unsigned int clientID)
     {
         if (GameMode::isMaster())
@@ -110 +110 @@
     }
 
-    void GametypeInfo::dispatchAnnounceMessage(const std::string& message) const
+    void GametypeInfo::dispatchAnnounceMessage(const std::string& message)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
@@ -116 +116 @@
     }
 
-    void GametypeInfo::dispatchKillMessage(const std::string& message) const
+    void GametypeInfo::dispatchKillMessage(const std::string& message)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
@@ -122 +122 @@
     }
 
-    void GametypeInfo::dispatchDeathMessage(const std::string& message) const
+    void GametypeInfo::dispatchDeathMessage(const std::string& message)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)

code/trunk/src/orxonox/objects/infos/GametypeInfo.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "Info.h"
 
@@ -59 +60 @@
                 { return this->hudtemplate_; }
 
-            void sendAnnounceMessage(const std::string& message) const;
-            void sendAnnounceMessage(const std::string& message, unsigned int clientID) const;
-            void sendKillMessage(const std::string& message, unsigned int clientID) const;
-            void sendDeathMessage(const std::string& message, unsigned int clientID) const;
+            void sendAnnounceMessage(const std::string& message);
+            void sendAnnounceMessage(const std::string& message, unsigned int clientID);
+            void sendKillMessage(const std::string& message, unsigned int clientID);
+            void sendDeathMessage(const std::string& message, unsigned int clientID);
 
-            void dispatchAnnounceMessage(const std::string& message) const;
-            void dispatchKillMessage(const std::string& message) const;
-            void dispatchDeathMessage(const std::string& message) const;
+            void dispatchAnnounceMessage(const std::string& message);
+            void dispatchKillMessage(const std::string& message);
+            void dispatchDeathMessage(const std::string& message);
 
         private:

code/trunk/src/orxonox/objects/infos/HumanPlayer.cc

@@ -29 +29 @@
 #include "HumanPlayer.h"
 
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/GameMode.h"
 #include "network/ClientInformation.h"
 #include "network/Host.h"
@@ -143 +143 @@
     float HumanPlayer::getPing() const
     {
-        return ClientInformation::findClient(this->getClientID())->getRTT();
+        return static_cast<float>(ClientInformation::findClient(this->getClientID())->getRTT());
     }
 
     float HumanPlayer::getPacketLossRatio() const
     {
-        return ClientInformation::findClient(this->getClientID())->getPacketLoss();
+        return static_cast<float>(ClientInformation::findClient(this->getClientID())->getPacketLoss());
     }
 

code/trunk/src/orxonox/objects/infos/HumanPlayer.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "PlayerInfo.h"
 

code/trunk/src/orxonox/objects/infos/Info.cc

@@ -28 +28 @@
 
 #include "Info.h"
-
 #include "core/CoreIncludes.h"
 

code/trunk/src/orxonox/objects/infos/PlayerInfo.cc

@@ -34 +34 @@
 #include "network/ClientInformation.h"
 #include "objects/gametypes/Gametype.h"
+#include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/infos/PongBot.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "Bot.h"