[Orxonox-commit 4323] r8994 - in code/branches/presentation2011: data/levels data/overlays src/orxonox/gametypes

[jo at orxonox.net]

Author: jo
Date: 2011-12-17 01:03:45 +0100 (Sat, 17 Dec 2011)
New Revision: 8994

Modified:
   code/branches/presentation2011/data/levels/missionOne.oxw
   code/branches/presentation2011/data/levels/underAttack.oxw
   code/branches/presentation2011/data/overlays/underAttackHUD.oxo
   code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc
Log:
Removing tansporter's healthbar.

Modified: code/branches/presentation2011/data/levels/missionOne.oxw
===================================================================
--- code/branches/presentation2011/data/levels/missionOne.oxw	2011-12-16 23:35:33 UTC (rev 8993)
+++ code/branches/presentation2011/data/levels/missionOne.oxw	2011-12-17 00:03:45 UTC (rev 8994)
@@ -1,6 +1,6 @@
 <LevelInfo
  name = "Mission One"
- description = "First guided steps in the orxonoxian universe."
+ description = "First Guided Steps in the Orxonoxian Universe."
  screenshot = "missionOne.png"
  tags = "mission"
 />

Modified: code/branches/presentation2011/data/levels/underAttack.oxw
===================================================================
--- code/branches/presentation2011/data/levels/underAttack.oxw	2011-12-16 23:35:33 UTC (rev 8993)
+++ code/branches/presentation2011/data/levels/underAttack.oxw	2011-12-17 00:03:45 UTC (rev 8994)
@@ -8,10 +8,10 @@
 <?lua
   include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("underAttackHUD.oxo")
   include("templates/spaceshipAssff.oxt")
   include("templates/lodInformation.oxt")
 ?>
+<!--OUTDATED: include("underAttackHUD.oxo") -->
 
 <Level
  gametype = "UnderAttack"

Modified: code/branches/presentation2011/data/overlays/underAttackHUD.oxo
===================================================================
--- code/branches/presentation2011/data/overlays/underAttackHUD.oxo	2011-12-16 23:35:33 UTC (rev 8993)
+++ code/branches/presentation2011/data/overlays/underAttackHUD.oxo	2011-12-17 00:03:45 UTC (rev 8994)
@@ -1,6 +1,6 @@
-<Template name="UnderAttackHUD">
+< Template name="UnderAttackHUD">
   <OverlayGroup name="UnderAttackHUD" scale = "1, 1">
-    <UnderAttackHealthBar
+    <OUTDATED-- UnderAttackHealthBar
      name                 = "HealthBar"
      background           = "Orxonox/HealthBarBackground"
      size                 = "0.45, 0.0875"

Modified: code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc
===================================================================
--- code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc	2011-12-16 23:35:33 UTC (rev 8993)
+++ code/branches/presentation2011/src/orxonox/gametypes/UnderAttack.cc	2011-12-17 00:03:45 UTC (rev 8994)
@@ -48,8 +48,8 @@
         this->destroyer_.setCallback(createFunctor(&UnderAttack::killedDestroyer, this));
         this->gameEnded_ = false;
 
-        this->setHUDTemplate("UnderAttackHUD");
-
+        //this->setHUDTemplate("UnderAttackHUD"); 
+        //This HUD is in conflict with the HUDEnemyHealthBar
         this->setConfigValues();
         this->timesequence_ = static_cast<int>(this->gameTime_);
     }