- Timestamp:
- Nov 6, 2015, 10:54:34 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h
r10765 r10768 207 207 virtual void spawneffect(); 208 208 209 //virtual void damage(float damage, Pawn* originator = 0);209 //virtual void damage(float damage, Pawn* originator = nullptr); 210 210 virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = nullptr, const btCollisionShape* cs = nullptr); 211 211
Note: See TracChangeset
for help on using the changeset viewer.