- 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/invader/InvaderEnemyShooter.cc
r10628 r11054 32 32 */ 33 33 34 #include "invader/InvaderPrereqs.h"35 34 #include "InvaderEnemyShooter.h" 36 // #include "worldentities/pawns/SpaceShip.h" 35 36 #include "core/CoreIncludes.h" 37 #include "core/command/Executor.h" 38 #include "Invader.h" 39 #include "InvaderShip.h" 37 40 38 41 namespace orxonox … … 56 59 removeHealth(2000); 57 60 58 if (player != NULL)61 if (player != nullptr) 59 62 { 60 63 float distPlayer = player->getPosition().z - getPosition().z; … … 74 77 { 75 78 Pawn::damage(damage, healthdamage, shielddamage, originator, cs); 76 if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL&& getHealth() <= 0)79 if (getGame() && orxonox_cast<InvaderShip*>(originator) != nullptr && getHealth() <= 0) 77 80 getGame()->addPoints(3*42); 78 81 }
Note: See TracChangeset
for help on using the changeset viewer.