Changeset 6108 for code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

Nov 20, 2009, 8:15:25 PM (15 years ago)

Author:

scheusso

Message:

merged steering branch to presentation2 branch

Location:

code/branches/presentation2

Files:

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

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

@@ -65 +65 @@
         this->camera_ = 0;
         this->xmlcontroller_ = 0;
+        this->controller_ = 0;
         this->reverseCamera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;