Changeset 10748 in orxonox.OLD

Timestamp:

Jun 20, 2007, 10:11:59 PM (17 years ago)

Author:

bknecht

Message:

fixed stupid gui segfault

Location:

branches/presentation/src

Files:

• util/hud.cc (modified) (6 diffs)
• util/hud.h (modified) (3 diffs)
• world_entities/creatures/fps_player.cc (modified) (4 diffs)
• world_entities/playable.cc (modified) (1 diff)

branches/presentation/src/util/hud.cc

@@ -58 +58 @@
   this->resX = 1;
   this->resY = 1;
+  this->leftHit = NULL;
+  this->rightHit = NULL;
+  this->ifinit = true;
 
         this->init();
@@ -72 +75 @@
   delete this->inputLine;
   delete this->notifier;
-  delete this->leftHit;
-  delete this->rightHit;
+  //delete this->leftHit;
+  //delete this->rightHit;
 
   delete this->_radar;
@@ -133 +136 @@
                 this->leftHit->loadImageFromFile("textures/gui/gui_hitbar.png");
                 this->leftHit->setParent2D(this->middleRect);
-                this->leftHit->shiftDir2D(0.5);
+                
                 
                 this->rightHit = new OrxGui::GLGuiImage();
@@ -438 +441 @@
         this->leftHit->show();
         this->rightHit->show();
+        hitBarCount = 0.33;
+}
+
+void Hud::tick(float dt)
+{
+
+  if (this->playmode == FirstPerson && this->leftHit != NULL)
+  {
+        if (this->ifinit)
+        {
+                this->leftHit->shiftDir2D(3.1416);
+                this->ifinit = false;
+        }
+        if (this->leftHit->isVisible())
+                hitBarCount -= dt;
+        if (hitBarCount < 0)
+        {
+                hitBarCount = 0;
+                this->leftHit->hide();
+                this->rightHit->hide();
+        }
+  }
 }
 
@@ -502 +527 @@
         this->leftHit->setRelCoor2D(0, 0);
         this->leftHit->setWidgetSize(this->resX/9, this->resX/3);
-        this->leftHit->show();
+        this->leftHit->hide();
         this->rightHit->setRelCoor2D(this->resX/3, 0);
         this->rightHit->setWidgetSize(this->resX/9, this->resX/3);
@@ -509 +534 @@
         this->barSocket->setWidgetSize(overlayWidth, overlayWidth);
         this->barSocket->setRelCoor2D(this->resX - overlayWidth, 0);
-        this->barSocket->hide();
+        this->barSocket->show();
 
         //this->middleRect->show();

branches/presentation/src/util/hud.h

@@ -52 +52 @@
   void getHit();
 
+  void tick(float dt);
+
   void setBackGround();
   void setEnergyWidget(OrxGui::GLGuiWidget* widget);
@@ -101 +103 @@
   unsigned int             resX;
   unsigned int             resY;
+
+  float                 hitBarCount;
   
   Hud::Playmode                         playmode; 
@@ -115 +119 @@
   OrxGui::GLGuiRadar*      _radar;
   PNode*                   radarCenterNode;
+
+  bool                  ifinit;
 
   OrxGui::GLGuiWidget*     rightRect;

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

@@ -328 +328 @@
   }
   
-  /*
+  
   if( this->bFire2 )
   {
@@ -353 +353 @@
   {
       this->changeZoom = true;
-  }*/
-  if( this->bFire2 )
+  }
+  /*if( this->bFire2 )
   {
       if( this->changeZoom )
@@ -378 +378 @@
       this->changeZoom = true;
       this->changingZoom = false;
-  }
-
-  this->getWeaponManager().tick(time);
+  }*/
+
+  /*this->getWeaponManager().tick(time);
   if( this->bFire)
   {
     this->getWeaponManager().fire();
-  }
+  }*/
+  Playable::tick(time);
 
 
@@ -448 +449 @@
   else
       speed = 100;
+
+  velocity.normalize();
   velocity *= speed;
 

branches/presentation/src/world_entities/playable.cc

@@ -451 +451 @@
   if (this->bFire)
     weaponMan.fire();
+
+  if (currentPlayer != NULL)
+        currentPlayer->hud().tick(dt);
 }