Changeset 11071 for code/trunk/src/modules/jump/JumpSpring.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/JumpSpring.cc
r10262 r11071 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"39 37 #include "JumpFigure.h" 40 #include "sound/WorldSound.h"41 #include "core/XMLPort.h"42 38 43 39 namespace orxonox … … 63 59 } 64 60 65 void JumpSpring::XMLPort(Element& xmlelement, XMLPort::Mode mode)66 {67 SUPER(JumpSpring, XMLPort, xmlelement, mode);68 }69 70 61 void JumpSpring::tick(float dt) 71 62 { … … 80 71 Vector3 springPosition = getWorldPosition(); 81 72 82 if (figure_ != NULL)73 if (figure_ != nullptr) 83 74 { 84 75 Vector3 figurePosition = figure_->getWorldPosition(); … … 103 94 void JumpSpring::accelerateFigure() 104 95 { 105 if (figure_ != 0)96 if (figure_ != nullptr) 106 97 { 107 98 figure_->JumpFromSpring(this);
Note: See TracChangeset
for help on using the changeset viewer.