Changeset 11071 for code/trunk/src/modules/jump/JumpPlatform.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/jump/JumpPlatform.cc
r10632 r11071 36 36 #include "core/CoreIncludes.h" 37 37 #include "core/GameMode.h" 38 #include "graphics/Model.h" 39 #include "gametypes/Gametype.h" 40 38 #include "core/XMLPort.h" 39 #include "sound/WorldSound.h" 41 40 #include "JumpFigure.h" 42 43 #include "sound/WorldSound.h"44 #include "core/XMLPort.h"45 41 46 42 namespace orxonox … … 52 48 RegisterObject(JumpPlatform); 53 49 54 figure_ = 0;50 figure_ = nullptr; 55 51 56 52 setPosition(Vector3(0,0,0)); … … 90 86 Vector3 platformPosition = this->getPosition(); 91 87 92 if (figure_ != NULL)88 if (figure_ != nullptr) 93 89 { 94 90 Vector3 figurePosition = figure_->getPosition();
Note: See TracChangeset
for help on using the changeset viewer.