Changeset 8996 for code/branches/presentation2011

Timestamp:

Dec 18, 2011, 1:18:51 AM (13 years ago)

Author:

jo

Message:

Repaired xml-interface in order to set a bot's team directly in the level.

Location:

code/branches/presentation2011

Files:

• data/levels/lastTeamStandingII.oxw (modified) (2 diffs)
• data/levels/missionOne.oxw (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/orxonox/controllers/FormationController.cc (modified) (1 diff)
• src/orxonox/gametypes/TeamGametype.cc (modified) (5 diffs)

code/branches/presentation2011/data/levels/lastTeamStandingII.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "On the fly"
- description = "Survive as a team."
+ name = "Last Team Standing II"
+ description = "Last Team Standing in an abstract level."
  screenshot = "onthefly.png"
  tags = "gametype"
@@ -16 +16 @@
 
 <Level
- name         = "On the fly"
- description  = "testmap for gametype last team standing"
  gametype     = "LastTeamStanding"
 >

code/branches/presentation2011/data/levels/missionOne.oxw

@@ -21 +21 @@
 
 <Level
- name         = "Mission One"
- description  = "How to steer a spaceship."
  gametype     = "Mission"
 >

code/branches/presentation2011/src/libraries/core/GUIManager.cc

@@ -223 +223 @@
 
     GUIManager* GUIManager::singletonPtr_s = 0;
-    /*static*/ const std::string GUIManager::defaultScheme_ = "Orxonox"; //TaharezGreen
+    /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen"; //Alternative: Orxonox (not fully complete yet, see the graphics menu)
 
     SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);

code/branches/presentation2011/src/orxonox/controllers/FormationController.cc

@@ -129 +129 @@
         SUPER(FormationController, XMLPort, xmlelement, mode);
 
+        XMLPortParam(FormationController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
         XMLPortParam(FormationController, "formationFlight", setFormationFlight, getFormationFlight, xmlelement, mode).defaultValues(false);
         XMLPortParam(FormationController, "formationSize", setFormationSize, getFormationSize, xmlelement, mode).defaultValues(STANDARD_MAX_FORMATION_SIZE);

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

@@ -49 +49 @@
         this->allowFriendlyFire_ = false;
         //this->playersPerTeam_ = 0;
-        this->maxPlayers_ = 2; //TEST
+        this->maxPlayers_ = 0; //Value "0": no limit is set.
         this->setConfigValues();
     }
@@ -75 +75 @@
     void TeamGametype::playerEntered(PlayerInfo* player)
     {
+        if(player == NULL) return; // catch null pointers
         Gametype::playerEntered(player);
-        if(player == NULL) return;
         this->findAndSetTeam(player);
         if( this->players_.size() <= maxPlayers_ || maxPlayers_  ==  0)
@@ -91 +91 @@
     void TeamGametype::findAndSetTeam(PlayerInfo* player)
     {
-         std::vector<unsigned int> playersperteam(this->teams_, 0);
+        if(player == NULL) return; // catch null pointers
+        std::vector<unsigned int> playersperteam(this->teams_, 0);
 
         for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
@@ -121 +122 @@
                  if(it->second == false) // waiting player found
                  {it->second = true; break;} // allow player to enter
-                        }
-                }
+            }
+        }
 
         if (valid_player)
@@ -140 +141 @@
             if(allowedInGame_[it->first] == false)//check if dead player is allowed to enter
             {
-                                continue;
+                continue;
             }
             if (it->second.state_ == PlayerState::Dead)