Changeset 7655 for code/trunk/src

Timestamp:

Nov 18, 2010, 9:54:39 PM (14 years ago)

Author:

rgrieder

Message:

Merged lastmanstanding back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/notifications/Notification.h (modified) (1 diff)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/LastManStandingInfos.cc (copied) (copied from code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc)
• src/modules/overlays/hud/LastManStandingInfos.h (copied) (copied from code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gametypes/Asteroids.cc (modified) (2 diffs)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/LastManStanding.cc (copied) (copied from code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc)
• src/orxonox/gametypes/LastManStanding.h (copied) (copied from code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/trunk/src/modules/notifications/Notification.h

@@ -80 +80 @@
 
             void initialize(void); //!< Registers the object and sets some default values.
+            void registerVariables(void) {}
 
     };

code/trunk/src/modules/overlays/OverlaysPrereqs.h

@@ -88 +88 @@
     class HUDTimer;
     class KillMessage;
+    class LastManStandingInfos;
     class TeamBaseMatchScore;
     class UnderAttackHealthBar;

code/trunk/src/modules/overlays/hud/CMakeLists.txt

@@ -15 +15 @@
   GametypeStaticMessage.cc
   GametypeFadingMessage.cc
+  LastManStandingInfos.cc
 )

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -95 +95 @@
     class Dynamicmatch;
     class Gametype;
+    class LastManStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/trunk/src/orxonox/gametypes/Asteroids.cc

@@ -41 +41 @@
         RegisterObject(Asteroids);
         this->firstCheckpointReached_ = false;
+        this->numberOfBots_=0; //sets number of default bots temporarly to 0
     }
 
@@ -75 +76 @@
         COUT(0) << message << std::endl;
         Host::Broadcast(message);
+
     }
 

code/trunk/src/orxonox/gametypes/CMakeLists.txt

@@ -7 +7 @@
   Asteroids.cc
   Dynamicmatch.cc
+  LastManStanding.cc
 )

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -155 +155 @@
             float shieldAbsorption_; // Has to be between 0 and 1
 
-            Pawn* lastHitOriginator_;
+            WeakPtr<Pawn> lastHitOriginator_;
 
             WeaponSystem* weaponSystem_;