Changeset 10449 in orxonox.OLD for trunk/src/util

Timestamp:

Jan 28, 2007, 5:46:16 PM (18 years ago)

Author:

patrick

Message:

drawing track is now loadable, merge from branche playability

Location:

trunk/src/util

Files:

• hud.cc (modified) (3 diffs)
• track/track.cc (modified) (1 diff)

trunk/src/util/hud.cc

@@ -129 +129 @@
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setStandardSettings();
     this->energyWidget->setParent2D(this->leftRect);
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->energyWidget)->setDisplayedImage("textures/gui/gui_electronics_icon.png");
     this->energyWidget->show();
     /*    this->energyWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -157 +158 @@
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->shieldWidget)->setStandardSettings();
     this->shieldWidget->setParent2D(this->leftRect);
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->shieldWidget)->setDisplayedImage("textures/gui/gui_shield_icon.png");
     this->shieldWidget->show();
     /*    this->shieldWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");
@@ -187 +189 @@
     //dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->armorWidget)->setStandardSettings();
     this->armorWidget->setParent2D(this->leftRect);
+    dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (this->armorWidget)->setDisplayedImage("textures/gui/gui_health_icon.png");
     this->armorWidget->show();
     /*    this->armorWidget->frontMaterial().setDiffuseMap("hud_energy_bar.png");

trunk/src/util/track/track.cc

@@ -93 +93 @@
            LoadParam_CYCLE(element, "mode", this, Track, setMode)
              .describe("Sets mode of track behavior");
-
      }
      LOAD_PARAM_END_CYCLE(element);