Changeset 9941 for code/trunk/src/orxonox/gametypes/UnderAttack.h

Timestamp:

Dec 29, 2013, 8:06:44 PM (10 years ago)

Author:

jo

Message:

Adding most of the changes that were proposed in the release2012 branch.

File:

• code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) (1 diff)

code/trunk/src/orxonox/gametypes/UnderAttack.h

@@ -51 +51 @@
             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+            virtual void playerEntered(PlayerInfo* player);
 
         protected:
             virtual void killedDestroyer();
+            void setTransporterHealth();
 
             WeakPtr<Destroyer> destroyer_;