Changeset 11054 for code/branches/cpp11_v3/src/modules/jump/JumpSpring.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/JumpSpring.cc
r10262 r11054 33 33 34 34 #include "JumpSpring.h" 35 35 36 #include "core/CoreIncludes.h" 36 #include "core/GameMode.h" 37 #include "graphics/Model.h" 38 #include "gametypes/Gametype.h" 37 #include "core/XMLPort.h" 39 38 #include "JumpFigure.h" 40 #include "sound/WorldSound.h"41 #include "core/XMLPort.h"42 39 43 40 namespace orxonox … … 80 77 Vector3 springPosition = getWorldPosition(); 81 78 82 if (figure_ != NULL)79 if (figure_ != nullptr) 83 80 { 84 81 Vector3 figurePosition = figure_->getWorldPosition(); … … 103 100 void JumpSpring::accelerateFigure() 104 101 { 105 if (figure_ != 0)102 if (figure_ != nullptr) 106 103 { 107 104 figure_->JumpFromSpring(this);
Note: See TracChangeset
for help on using the changeset viewer.