Changeset 8706 for code/trunk/src/modules/overlays

Timestamp:

Jun 14, 2011, 8:53:28 PM (14 years ago)

Author:

dafrick

Message:

Merging presentation branch back into trunk.
There are many new features and also a lot of other changes and bugfixes, if you want to know, digg through the svn log.
Not everything is yet working as it should, but it should be fairly stable. If you habe any bug reports, just send me an email.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/OverlaysPrereqs.h (modified) (1 diff)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/GametypeStatus.cc (deleted)
• src/modules/overlays/hud/GametypeStatus.h (deleted)
• src/modules/overlays/hud/HUDBar.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDBar.h (modified) (1 diff)
• src/modules/overlays/hud/HUDBoostBar.cc (copied) (copied from code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc)
• src/modules/overlays/hud/HUDBoostBar.h (copied) (copied from code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDSpeedBar.cc (modified) (1 diff)

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

@@ -89 +89 @@
     class HUDRadar;
     class HUDSpeedBar;
+    class HUDBoostBar;
     class HUDTimer;
     class KillMessage;

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

@@ -4 +4 @@
   HUDRadar.cc
   HUDSpeedBar.cc
+  HUDBoostBar.cc
   HUDHealthBar.cc
   HUDTimer.cc
   ChatOverlay.cc
-  GametypeStatus.cc
   AnnounceMessage.cc
   KillMessage.cc

code/trunk/src/modules/overlays/hud/HUDBar.cc

@@ -26 +26 @@
  *      Fabian 'x3n' Landau
  *      Reto Grieder
+ *      Benjamin Knecht
  *
  */

code/trunk/src/modules/overlays/hud/HUDBar.h

@@ -26 +26 @@
  *      Fabian 'x3n' Landau
  *      Reto Grieder
+ *      Benjamin Knecht
  *
  */

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -342 +342 @@
     text->hide();
 
-    ObjectInfo tempStruct = {panel, text, false};
+    ObjectInfo tempStruct = {panel, text, false /*, TODO: initialize wasOutOfView_ */};
     activeObjectList_[object] = tempStruct;
 

code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc

@@ -54 +54 @@
         SUPER(HUDSpeedBar, tick, dt);
 
-        if (this->owner_ && this->owner_->getEngine())
+        if (this->owner_)
         {
-            float value = this->owner_->getVelocity().length() / (this->owner_->getEngine()->getMaxSpeedFront() * this->owner_->getEngine()->getSpeedFactor() * this->owner_->getEngine()->getBoostFactor());
+            float value = this->owner_->getVelocity().length() / (this->owner_->getMaxSpeedFront() * this->owner_->getSpeedFactor() * this->owner_->getBoostFactor());
             this->setValue(value);
         }