Changeset 9334 for code/branches/presentation2012merge

Timestamp:

Jul 22, 2012, 10:21:36 PM (12 years ago)

Author:

landauf

Message:

removed UnderAttackHealthBar which is not needed anymore because of HUDEnemyHealthBar

Location:

code/branches/presentation2012merge

Files:

• data/levels/underAttack.oxw (modified) (1 diff)
• data/overlays/underAttackHUD.oxo (deleted)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted)
• src/modules/overlays/hud/UnderAttackHealthBar.h (deleted)
• src/orxonox/gametypes/UnderAttack.cc (modified) (1 diff)

code/branches/presentation2012merge/data/levels/underAttack.oxw

@@ -12 +12 @@
   include("templates/lodInformation.oxt")
 ?>
-<!--OUTDATED: include("underAttackHUD.oxo") -->
 
 <Level

code/branches/presentation2012merge/src/modules/overlays/OverlaysPrereqs.h

@@ -95 +95 @@
     class PauseNotice;
     class TeamBaseMatchScore;
-    class UnderAttackHealthBar;
 
     // stats

code/branches/presentation2012merge/src/modules/overlays/hud/CMakeLists.txt

@@ -12 +12 @@
   KillMessage.cc
   DeathMessage.cc
-  UnderAttackHealthBar.cc
   TeamBaseMatchScore.cc
   GametypeStaticMessage.cc

code/branches/presentation2012merge/src/orxonox/gametypes/UnderAttack.cc

@@ -49 +49 @@
         this->gameEnded_ = false;
 
-        //this->setHUDTemplate("UnderAttackHUD"); 
-        //This HUD is in conflict with the HUDEnemyHealthBar
         this->setConfigValues();
         this->timesequence_ = static_cast<int>(this->gameTime_);