- 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/towerdefense/TowerDefenseEnemy.cc
r10629 r11071 27 27 RegisterObject(TowerDefenseEnemy); 28 28 29 this->setCollisionType(WorldEntity:: Dynamic);29 this->setCollisionType(WorldEntity::CollisionType::Dynamic); 30 30 //needed to keep track of the PlayerStats coded in TowerDefense.h 31 31 this->td = orxonox_cast<TowerDefense*>(this->getGametype()); … … 38 38 } 39 39 40 void TowerDefenseEnemy::tick(float dt)41 {42 //orxout() << "TDE tick1" << endl;43 SUPER(TowerDefenseEnemy, tick, dt);44 //orxout() << "TDE tick2" << endl;45 }46 47 40 WeakPtr<TowerDefense> TowerDefenseEnemy::getGame() 48 41 { 49 if (game == NULL)42 if (game == nullptr) 50 43 { 51 for ( ObjectList<TowerDefense>::iterator it = ObjectList<TowerDefense>::begin(); it != ObjectList<TowerDefense>::end(); ++it)52 game = *it;44 for (TowerDefense* towerDefense : ObjectList<TowerDefense>()) 45 game = towerDefense; 53 46 } 54 47 return game; 55 48 } 56 49 57 void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator )50 void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) 58 51 { 59 52 Pawn::damage(damage, healthdamage, shielddamage, originator);
Note: See TracChangeset
for help on using the changeset viewer.