Changeset 10753 in orxonox.OLD

Timestamp:

Jun 20, 2007, 11:13:42 PM (17 years ago)

Author:

bknecht

Message:

few changes

Location:

branches/presentation/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (2 diffs)
• world_entities/weapons/crosshair.cc (modified) (1 diff)

branches/presentation/src/util/hud.cc

@@ -142 +142 @@
                 
                 this->leftHit = new OrxGui::GLGuiImage();
-                this->leftHit->loadImageFromFile("textures/gui/gui_hitbar.png");
+                this->leftHit->loadImageFromFile("textures/gui/gui_hitbarl.png");
                 this->leftHit->setParent2D(this->middleRect);
                 

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -32 +32 @@
 #include "weapons/fps_sniper_rifle.h"
 #include "weapons/aiming_system.h"
+#include "weapons/crosshair.h"
 
 #include "aabb.h"
@@ -155 +156 @@
   this->getWeaponManager().getFixedTarget()->setParentMode(PNODE_ALL);
   this->getWeaponManager().getFixedTarget()->setRelCoor(10,0,0);
+  dynamic_cast<Crosshair*>(this->getWeaponManager().getFixedTarget())->setTexture("textures/aim2.png");
   
   if( true /*State::isOnline()*/ )

branches/presentation/src/world_entities/weapons/crosshair.cc

@@ -32 +32 @@
 Crosshair::Crosshair (const TiXmlElement* root)
 {
+
   this->init();