Changeset 11071 for code/trunk/src/modules/jump/JumpProjectile.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/JumpProjectile.cc
r10624 r11071 33 33 34 34 #include "JumpProjectile.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" 38 #include "JumpEnemy.h" 42 39 43 40 namespace orxonox … … 49 46 RegisterObject(JumpProjectile); 50 47 51 figure_ = 0;48 figure_ = nullptr; 52 49 setPosition(Vector3(0,0,0)); 53 50 setVelocity(Vector3(0,0,250.0)); … … 60 57 } 61 58 62 void JumpProjectile::XMLPort(Element& xmlelement, XMLPort::Mode mode)63 {64 SUPER(JumpProjectile, XMLPort, xmlelement, mode);65 }66 67 59 void JumpProjectile::tick(float dt) 68 60 { … … 71 63 Vector3 projectilePosition = getPosition(); 72 64 73 for ( ObjectList<JumpEnemy>::iterator it = ObjectList<JumpEnemy>::begin(); it != ObjectList<JumpEnemy>::end(); ++it)65 for (JumpEnemy* enemy : ObjectList<JumpEnemy>()) 74 66 { 75 Vector3 enemyPosition = it->getPosition();76 float enemyWidth = it->getWidth();77 float enemyHeight = it->getHeight();67 Vector3 enemyPosition = enemy->getPosition(); 68 float enemyWidth = enemy->getWidth(); 69 float enemyHeight = enemy->getHeight(); 78 70 79 71 if(projectilePosition.x > enemyPosition.x-enemyWidth && projectilePosition.x < enemyPosition.x+enemyWidth && projectilePosition.z > enemyPosition.z-enemyHeight && projectilePosition.z < enemyPosition.z+enemyHeight) 80 72 { 81 it->dead_ = true;73 enemy->dead_ = true; 82 74 } 83 75 }
Note: See TracChangeset
for help on using the changeset viewer.