Changeset 8904 for code/branches/gamecontent/src

Timestamp:

Oct 25, 2011, 10:56:31 PM (13 years ago)

Author:

jo

Message:

On the way to a multiplayer gametype basceclass.

Location:

code/branches/gamecontent/src

Files:

• modules/pong/Pong.cc (modified) (2 diffs)
• orxonox/controllers/WaypointPatrolController.cc (modified) (2 diffs)
• orxonox/controllers/WaypointPatrolController.h (modified) (2 diffs)
• orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• orxonox/gametypes/Gametype.h (modified) (1 diff)
• orxonox/gametypes/Mission.cc (added)
• orxonox/gametypes/Mission.h (added)
• orxonox/gametypes/TeamDeathmatch.h (modified) (1 diff)
• orxonox/gametypes/TeamGametype.cc (modified) (2 diffs)
• orxonox/gametypes/TeamGametype.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/gamecontent/src/modules/pong/Pong.cc

@@ -293 +293 @@
             std::string message(name1 + " has won!");
             ChatManager::message(message);
-this->tick(0);
             this->end();
         }
@@ -301 +300 @@
              std::string message2(name2 + " has won!");
              ChatManager::message(message2);
-this->tick(0);
              this->end();
         }

code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.cc

@@ -42 +42 @@
         RegisterObject(WaypointPatrolController);
 
-        //this->team_ = 0;
         this->alertnessradius_ = 500;
 
@@ -53 +52 @@
 
         XMLPortParam(WaypointPatrolController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
-//        XMLPortParam(WaypointPatrolController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(0);
     }
 

code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.h

@@ -46 +46 @@
             virtual void tick(float dt);
 
-           /* inline void setTeam(int team)
-                { this->team_ = team; }
-            inline int getTeam() const
-                { return this->team_; } */
-
             inline void setAlertnessRadius(float radius)
                 { this->alertnessradius_ = radius; }
@@ -59 +54 @@
             void searchEnemy();
 
-            //int team_;
             float alertnessradius_;
             Timer patrolTimer_;

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

@@ -10 +10 @@
   LastTeamStanding.cc
   TeamGametype.cc
+  Mission.cc
 )

code/branches/gamecontent/src/orxonox/gametypes/Gametype.h

@@ -123 +123 @@
                 { return this->gtinfo_->getHUDTemplate(); }
 
-            void addBots(unsigned int amount);
+            virtual void addBots(unsigned int amount);
             void killBots(unsigned int amount = 0);
 

code/branches/gamecontent/src/orxonox/gametypes/TeamDeathmatch.h

@@ -56 +56 @@
 
             int getTeam(PlayerInfo* player);
-
             inline const ColourValue& getTeamColour(int teamnr) const
                 { return this->teamcolours_[teamnr]; }

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc

@@ -67 +67 @@
     {
         Gametype::playerEntered(player);
-
-        std::vector<unsigned int> playersperteam(this->teams_, 0);
+        this->findAndSetTeam(player);
+    }
+
+    void TeamGametype::findAndSetTeam(PlayerInfo* player)
+    {
+         std::vector<unsigned int> playersperteam(this->teams_, 0);
 
         for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
@@ -86 +90 @@
 
         this->teamnumbers_[player] = minplayersteam;
+
     }
 

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h

@@ -47 +47 @@
 
             virtual void playerEntered(PlayerInfo* player);
+            virtual void findAndSetTeam(PlayerInfo* player);
             virtual bool playerLeft(PlayerInfo* player);
 

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc

@@ -455 +455 @@
         SUPER(Pawn, changedActivity);
 
-        this->setRadarVisibility(this->isActive());
+        this->setRadarVisibility(this->isVisible());
     }