Changeset 10748 in orxonox.OLD for branches/presentation/src/world_entities

Timestamp:

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

Author:

bknecht

Message:

fixed stupid gui segfault

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (4 diffs)
• playable.cc (modified) (1 diff)

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);
 }