Changeset 8980 for code/branches/presentation2011/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

Dec 14, 2011, 2:38:37 PM (13 years ago)

Author:

jo

Message:

teamgametype merged into trunk

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (3 diffs)

code/branches/presentation2011/src/orxonox/worldentities/ControllableEntity.cc

@@ -74 +74 @@
         this->bMouseLook_ = false;
         this->mouseLookSpeed_ = 200;
-        this->bIsRocket_ = false;
 
         this->server_position_         = Vector3::ZERO;
@@ -88 +87 @@
         this->setPriority( Priority::VeryHigh );
         this->registerVariables();
+        this->team_ = -1;
     }
 
@@ -120 +120 @@
         SUPER(ControllableEntity, XMLPort, xmlelement, mode);
 
+        XMLPortParam(ControllableEntity, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
         XMLPortParam(ControllableEntity, "hudtemplate", setHudTemplate, getHudTemplate, xmlelement, mode);
         XMLPortParam(ControllableEntity, "camerapositiontemplate", setCameraPositionTemplate, getCameraPositionTemplate, xmlelement, mode);