Changeset 11559 for code/branches/Waypoints_HS17/src/orxonox
- Timestamp:
- Nov 13, 2017, 4:16:35 PM (7 years ago)
- Location:
- code/branches/Waypoints_HS17/src/orxonox/worldentities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc
r11539 r11559 49 49 RegisterObject(Arrow); 50 50 51 this->myController_ = NULL;51 //this->myController_ = NULL; 52 52 53 53 this->localLinearAcceleration_.setValue(0, 0, 0); … … 69 69 { 70 70 // Deletes the controller if the object was initialized and the pointer to the controller is not NULL. 71 if( this->isInitialized() && this->myController_ != NULL )72 delete this->myController_;71 // if( this->isInitialized() && this->myController_ != NULL ) 72 //delete this->myController_; 73 73 } 74 74 … … 184 184 } 185 185 186 186 187 } -
code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.h
r11539 r11559 33 33 34 34 #include "core/XMLPort.h" 35 #include "controllers/ArrowController.h"35 //#include "controllers/ArrowController.h" 36 36 37 37 #include "ControllableEntity.h" 38 #include "WorldEntity.h" 38 39 39 40 namespace orxonox { … … 132 133 133 134 private: 134 ArrowController *myController_; //!< The controller of the Arrow.135 //ArrowController *myController_; //!< The controller of the Arrow. 135 136 136 137 btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Arrow the next tick.
Note: See TracChangeset
for help on using the changeset viewer.