Changeset 11054 for code/branches/cpp11_v3/src/modules/jump/JumpEnemy.cc
- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/modules/jump/JumpEnemy.cc
r10624 r11054 35 35 36 36 #include "core/CoreIncludes.h" 37 #include "core/GameMode.h" 38 #include "graphics/Model.h" 39 #include "gametypes/Gametype.h" 40 37 #include "core/XMLPort.h" 41 38 #include "JumpFigure.h" 42 43 #include "sound/WorldSound.h"44 #include "core/XMLPort.h"45 39 46 40 namespace orxonox … … 57 51 58 52 dead_ = false; 59 figure_ = 0;53 figure_ = nullptr; 60 54 width_ = 0.0; 61 55 height_ = 0.0; … … 125 119 Vector3 enemyPosition = getPosition(); 126 120 127 if (figure_ != NULL)121 if (figure_ != nullptr) 128 122 { 129 123 Vector3 figurePosition = figure_->getPosition();
Note: See TracChangeset
for help on using the changeset viewer.