Changeset 9614 for code/branches/formationupdate/src/orxonox

Timestamp:

Apr 9, 2013, 4:02:46 PM (12 years ago)

Author:

maxima

Message:

Only a few comments

File:

• code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc (modified) (3 diffs)

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

@@ -308 +308 @@
     }
 
-    // Two functions to find the slaves of a Pawn
+
+    /* Two functions to find the slaves of a Pawn
+     *
+     */
     bool Pawn::hasSlaves()
     {
-        /* TEST TEST This is used to find out if the current pawn is also
-                 * the master of the formation and to find his slaves.
-                 *
-                 */
                 for (ObjectList<FormationController>::iterator it =
                          ObjectList<FormationController>::begin();
@@ -327 +326 @@
                 }
                 return false;
-                /* TEST TEST */
     }
 
@@ -358 +356 @@
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
             {
-                if(this->hasSlaves())
+                /* Do different things if Pawn is the Master of a Formation
+                 * Doesn't work yet
+                 *
+                 * if(this->hasSlaves())
                 {
                                 // start to control a slave
                                 this->getPlayer()->startControl(this->getSlave()->getControllableEntity());
-                }
+                }*/
                 this->getPlayer()->stopControl();
             }
-            /*if (GameMode::isMaster())
+            if (GameMode::isMaster())
             {
 //                this->deathEffect();
                 this->goWithStyle();
-            }*/
+            }
         }
     }