Changeset 3179 for code/branches/pch/src/orxonox/objects/infos

Timestamp:

Jun 15, 2009, 8:20:14 PM (16 years ago)

Author:

rgrieder

Message:

Cleanup in gametypes, infos and items

Location:

code/branches/pch/src/orxonox/objects/infos

Files:

• Bot.cc (modified) (3 diffs)
• Bot.h (modified) (1 diff)
• GametypeInfo.cc (modified) (1 diff)
• GametypeInfo.h (modified) (1 diff)
• HumanPlayer.cc (modified) (1 diff)
• HumanPlayer.h (modified) (1 diff)
• Info.cc (modified) (1 diff)
• PlayerInfo.cc (modified) (1 diff)
• PongBot.h (modified) (1 diff)

code/branches/pch/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/branches/pch/src/orxonox/objects/infos/Bot.h

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

code/branches/pch/src/orxonox/objects/infos/GametypeInfo.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
+#include "core/ObjectList.h"
 #include "network/NetworkFunction.h"
 #include "network/Host.h"

code/branches/pch/src/orxonox/objects/infos/GametypeInfo.h

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

code/branches/pch/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"

code/branches/pch/src/orxonox/objects/infos/HumanPlayer.h

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

code/branches/pch/src/orxonox/objects/infos/Info.cc

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

code/branches/pch/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/branches/pch/src/orxonox/objects/infos/PongBot.h

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