Changeset 10733 for code/branches/cpp11_v2/src/modules/jump/Jump.cc
- Timestamp:
- Oct 31, 2015, 6:11:53 PM (8 years ago)
- Location:
- code/branches/cpp11_v2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2
- Property svn:mergeinfo changed
/code/branches/cpp11 (added) merged: 10439-10441,10443,10545
- Property svn:mergeinfo changed
-
code/branches/cpp11_v2/src/modules/jump/Jump.cc
r10262 r10733 34 34 #include "Jump.h" 35 35 #include "core/CoreIncludes.h" 36 #include "core/EventIncludes.h" 37 #include "core/command/Executor.h" 38 #include "core/config/ConfigValueIncludes.h" 39 #include "gamestates/GSLevel.h" 40 #include "chat/ChatManager.h" 36 41 37 #include "JumpCenterpoint.h" 42 38 #include "JumpPlatform.h" … … 56 52 #include "JumpBoots.h" 57 53 #include "JumpShield.h" 54 55 #include "gamestates/GSLevel.h" 58 56 #include "infos/PlayerInfo.h" 57 #include "graphics/Camera.h" 59 58 60 59 namespace orxonox … … 70 69 camera = 0; 71 70 setHUDTemplate("JumpHUD"); 72 73 setConfigValues();74 71 } 75 72 … … 1300 1297 return figure_->dead_; 1301 1298 } 1299 1300 void Jump::setCenterpoint(JumpCenterpoint* center) 1301 { 1302 center_ = center; 1303 } 1304 1302 1305 }
Note: See TracChangeset
for help on using the changeset viewer.