Changeset 9667 for code/trunk/src/orxonox/gametypes

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/Asteroids.cc (modified) (1 diff)
• src/orxonox/gametypes/Asteroids.h (modified) (1 diff)
• src/orxonox/gametypes/Deathmatch.cc (modified) (1 diff)
• src/orxonox/gametypes/Deathmatch.h (modified) (1 diff)
• src/orxonox/gametypes/Dynamicmatch.cc (modified) (2 diffs)
• src/orxonox/gametypes/Dynamicmatch.h (modified) (1 diff)
• src/orxonox/gametypes/Gametype.cc (modified) (7 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (2 diffs)
• src/orxonox/gametypes/LastManStanding.cc (modified) (1 diff)
• src/orxonox/gametypes/LastManStanding.h (modified) (1 diff)
• src/orxonox/gametypes/LastTeamStanding.cc (modified) (1 diff)
• src/orxonox/gametypes/LastTeamStanding.h (modified) (1 diff)
• src/orxonox/gametypes/Mission.cc (modified) (1 diff)
• src/orxonox/gametypes/Mission.h (modified) (1 diff)
• src/orxonox/gametypes/TeamBaseMatch.cc (modified) (1 diff)
• src/orxonox/gametypes/TeamBaseMatch.h (modified) (1 diff)
• src/orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)
• src/orxonox/gametypes/TeamDeathmatch.h (modified) (1 diff)
• src/orxonox/gametypes/TeamGametype.cc (modified) (2 diffs)
• src/orxonox/gametypes/TeamGametype.h (modified) (1 diff)
• src/orxonox/gametypes/UnderAttack.cc (modified) (2 diffs)
• src/orxonox/gametypes/UnderAttack.h (modified) (1 diff)

code/trunk/src/orxonox/gametypes/Asteroids.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Asteroids);
+    RegisterUnloadableClass(Asteroids);
 
-    Asteroids::Asteroids(BaseObject* creator) : Gametype(creator)
+    Asteroids::Asteroids(Context* context) : Gametype(context)
     {
         RegisterObject(Asteroids);

code/trunk/src/orxonox/gametypes/Asteroids.h

@@ -38 +38 @@
     {
         public:
-            Asteroids(BaseObject* creator);
+            Asteroids(Context* context);
             virtual ~Asteroids() {}
 

code/trunk/src/orxonox/gametypes/Deathmatch.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Deathmatch);
+    RegisterUnloadableClass(Deathmatch);
 
-    Deathmatch::Deathmatch(BaseObject* creator) : Gametype(creator)
+    Deathmatch::Deathmatch(Context* context) : Gametype(context)
     {
         RegisterObject(Deathmatch);

code/trunk/src/orxonox/gametypes/Deathmatch.h

@@ -38 +38 @@
     {
         public:
-            Deathmatch(BaseObject* creator);
+            Deathmatch(Context* context);
             virtual ~Deathmatch() {}
 

code/trunk/src/orxonox/gametypes/Dynamicmatch.cc

@@ -54 +54 @@
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "interfaces/TeamColourable.h"
 #include "items/Engine.h"
@@ -62 +62 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Dynamicmatch);
-
-    Dynamicmatch::Dynamicmatch(BaseObject* creator) : Gametype(creator)
+    RegisterUnloadableClass(Dynamicmatch);
+
+    Dynamicmatch::Dynamicmatch(Context* context) : Gametype(context)
     {
         RegisterObject(Dynamicmatch);

code/trunk/src/orxonox/gametypes/Dynamicmatch.h

@@ -44 +44 @@
     {
         public:
-            Dynamicmatch(BaseObject* creator);
+            Dynamicmatch(Context* context);
             virtual ~Dynamicmatch() {}
 

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

@@ -32 +32 @@
 #include "core/Core.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/GameMode.h"
 #include "core/command/ConsoleCommand.h"
@@ -47 +47 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Gametype);
-
-    Gametype::Gametype(BaseObject* creator) : BaseObject(creator)
+    RegisterUnloadableClass(Gametype);
+
+    Gametype::Gametype(Context* context) : BaseObject(context)
     {
         RegisterObject(Gametype);
 
-        this->gtinfo_ = new GametypeInfo(creator);
+        this->gtinfo_ = new GametypeInfo(context);
 
         this->setGametype(SmartPtr<Gametype>(this, false));
@@ -74 +74 @@
         if (GameMode::showsGraphics() && !this->scoreboardTemplate_.empty())
         {
-            this->scoreboard_ = new OverlayGroup(this);
+            this->scoreboard_ = new OverlayGroup(context);
             this->scoreboard_->addTemplate(this->scoreboardTemplate_);
             this->scoreboard_->setGametype(this);
@@ -160 +160 @@
                 ControllableEntity* oldentity = it->first->getControllableEntity();
 
-                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity);
+                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getContext());
                 if (oldentity->getCamera())
                 {
@@ -283 +283 @@
                     this->gtinfo_->pawnKilled(victim->getPlayer());
 
-                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
+                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getContext());
                 if (victim->getCamera())
                 {
@@ -458 +458 @@
         {
             // force spawn at spawnpoint with default pawn
-            ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn);
+            ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn->getContext());
             spawn->spawn(entity);
             player->startControl(entity);
@@ -472 +472 @@
     {
         for (unsigned int i = 0; i < amount; ++i)
-            this->botclass_.fabricate(this);
+            this->botclass_.fabricate(this->getContext());
     }
 

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

@@ -37 +37 @@
 
 #include "core/BaseObject.h"
-#include "core/SubclassIdentifier.h"
+#include "core/class/SubclassIdentifier.h"
 #include "tools/interfaces/Tickable.h"
 #include "infos/GametypeInfo.h"
@@ -67 +67 @@
 
         public:
-            Gametype(BaseObject* creator);
+            Gametype(Context* context);
             virtual ~Gametype();
 

code/trunk/src/orxonox/gametypes/LastManStanding.cc

@@ -33 +33 @@
 #include "infos/PlayerInfo.h"
 #include "worldentities/pawns/Pawn.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "util/Convert.h"
 
 namespace orxonox
 {
-    CreateUnloadableFactory(LastManStanding);
-
-    LastManStanding::LastManStanding(BaseObject* creator) : Deathmatch(creator)
+    RegisterUnloadableClass(LastManStanding);
+
+    LastManStanding::LastManStanding(Context* context) : Deathmatch(context)
     {
         RegisterObject(LastManStanding);

code/trunk/src/orxonox/gametypes/LastManStanding.h

@@ -65 +65 @@
 
         public:
-            LastManStanding(BaseObject* creator); //!< Default Constructor.
+            LastManStanding(Context* context); //!< Default Constructor.
             virtual ~LastManStanding() {} //!< Default Destructor.
             void setConfigValues(); //!< Makes values configurable.

code/trunk/src/orxonox/gametypes/LastTeamStanding.cc

@@ -33 +33 @@
 #include "infos/PlayerInfo.h"
 #include "worldentities/pawns/Pawn.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "util/Convert.h"
 
 namespace orxonox
 {
-    CreateUnloadableFactory(LastTeamStanding);
-
-    LastTeamStanding::LastTeamStanding(BaseObject* creator) : TeamDeathmatch(creator)
+    RegisterUnloadableClass(LastTeamStanding);
+
+    LastTeamStanding::LastTeamStanding(Context* context) : TeamDeathmatch(context)
     {
         RegisterObject(LastTeamStanding);

code/trunk/src/orxonox/gametypes/LastTeamStanding.h

@@ -71 +71 @@
 
         public:
-            LastTeamStanding(BaseObject* creator); //!< Default Constructor.
+            LastTeamStanding(Context* context); //!< Default Constructor.
             virtual ~LastTeamStanding(); //!< Default Destructor.
 

code/trunk/src/orxonox/gametypes/Mission.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(Mission);
+    RegisterUnloadableClass(Mission);
 
-    Mission::Mission(BaseObject* creator) : TeamGametype(creator)
+    Mission::Mission(Context* context) : TeamGametype(context)
     {
         RegisterObject(Mission);

code/trunk/src/orxonox/gametypes/Mission.h

@@ -39 +39 @@
     {
         public:
-            Mission(BaseObject* creator);
+            Mission(Context* context);
             virtual ~Mission() {}
 

code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamBaseMatch);
-
-    TeamBaseMatch::TeamBaseMatch(BaseObject* creator) : TeamDeathmatch(creator)
+    RegisterUnloadableClass(TeamBaseMatch);
+
+    TeamBaseMatch::TeamBaseMatch(Context* context) : TeamDeathmatch(context)
     {
         RegisterObject(TeamBaseMatch);

code/trunk/src/orxonox/gametypes/TeamBaseMatch.h

@@ -41 +41 @@
     {
         public:
-            TeamBaseMatch(BaseObject* creator);
+            TeamBaseMatch(Context* context);
             virtual ~TeamBaseMatch() {}
 

code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamDeathmatch);
+    RegisterUnloadableClass(TeamDeathmatch);
 
-    TeamDeathmatch::TeamDeathmatch(BaseObject* creator) : TeamGametype(creator)
+    TeamDeathmatch::TeamDeathmatch(Context* context) : TeamGametype(context)
     {
         RegisterObject(TeamDeathmatch);

code/trunk/src/orxonox/gametypes/TeamDeathmatch.h

@@ -38 +38 @@
     {
         public:
-            TeamDeathmatch(BaseObject* creator);
+            TeamDeathmatch(Context* context);
             virtual ~TeamDeathmatch() {}
 

code/trunk/src/orxonox/gametypes/TeamGametype.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "infos/PlayerInfo.h"
 #include "interfaces/TeamColourable.h"
@@ -40 +40 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(TeamGametype);
-
-    TeamGametype::TeamGametype(BaseObject* creator) : Gametype(creator)
+    RegisterUnloadableClass(TeamGametype);
+
+    TeamGametype::TeamGametype(Context* context) : Gametype(context)
     {
         RegisterObject(TeamGametype);

code/trunk/src/orxonox/gametypes/TeamGametype.h

@@ -41 +41 @@
     {
         public:
-            TeamGametype(BaseObject* creator);
+            TeamGametype(Context* context);
             virtual ~TeamGametype() {}
 

code/trunk/src/orxonox/gametypes/UnderAttack.cc

@@ -31 +31 @@
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "chat/ChatManager.h"
 #include "worldentities/pawns/Destroyer.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    CreateUnloadableFactory(UnderAttack);
+    RegisterUnloadableClass(UnderAttack);
 
-    UnderAttack::UnderAttack(BaseObject* creator) : TeamDeathmatch(creator)
+    UnderAttack::UnderAttack(Context* context) : TeamDeathmatch(context)
     {
         RegisterObject(UnderAttack);

code/trunk/src/orxonox/gametypes/UnderAttack.h

@@ -39 +39 @@
     {
         public:
-            UnderAttack(BaseObject* creator);
+            UnderAttack(Context* context);
             virtual ~UnderAttack() {}