Changeset 10718 in orxonox.OLD

Timestamp:

Jun 18, 2007, 5:06:59 PM (17 years ago)

Author:

rennerc

Message:

dead gui

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (5 diffs)
• creatures/fps_player.h (modified) (2 diffs)
• npcs/adm_turret.cc (modified) (1 diff)
• weapons/aiming_system.cc (modified) (1 diff)
• weapons/bsp_weapon.cc (modified) (4 diffs)
• weapons/fps_sniper_rifle.cc (modified) (2 diffs)
• world_entity.cc (modified) (2 diffs)

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

@@ -42 +42 @@
 #include "shared_network_data.h"
 
+#include "event_handler.h"
+
+#include "story_entity.h"
 
 
@@ -126 +129 @@
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(EV_MOUSE_MOTION);
+  
+  this->deadBox = NULL;
 
   // weapon manager for the fps
@@ -276 +281 @@
 void FPSPlayer::tick (float time)
 {
-     // Second init-step
+  if ( deadBox != NULL )
+  {
+    OrxGui::GLGuiHandler::getInstance()->tick( time );
+  }
+     
+  // Second init-step
   if ( !this->initWeapon )
   {
@@ -587 +597 @@
 {
   Playable::destroy( killer );
-
+  this->showDeadScreen();
+  myList = this->getOMListNumber();
   toList( OM_DEAD );
 }
@@ -595 +606 @@
         State::getPlayer()->hud().notifyUser(message);
 }
+
+void FPSPlayer::onButtonContinue( )
+{
+  OrxGui::GLGuiHandler::getInstance()->deactivateCursor( true );
+  EventHandler::getInstance()->popState();
+  WorldEntity::reset();
+  toList( myList );
+  deadBox->hideAll();
+}
+
+void FPSPlayer::onButtonExit( )
+{
+  State::getCurrentStoryEntity()->setNextStoryID( 0 );
+  State::getCurrentStoryEntity()->stop();
+}
+
+void FPSPlayer::showDeadScreen( )
+{
+  EventHandler::getInstance()->pushState( ES_MENU );
+
+  OrxGui::GLGuiHandler::getInstance()->activateCursor();
+  
+  if ( deadBox )
+    delete deadBox;
+  deadBox = new OrxGui::GLGuiBox();
+  deadBox->setAbsCoor2D( 100, 100 );
+
+  OrxGui::GLGuiText* text = new OrxGui::GLGuiText();
+  text->setText( "Game Over! - You died!" );
+  OrxGui::GLGuiPushButton* exitButton = new OrxGui::GLGuiPushButton( "exit" );
+  exitButton->released.connect(this, &FPSPlayer::onButtonExit);
+  OrxGui::GLGuiPushButton* continueButton = new OrxGui::GLGuiPushButton( "continue" );
+  continueButton->released.connect(this, &FPSPlayer::onButtonContinue);
+
+  deadBox->pack( text );
+  deadBox->pack( continueButton );
+  deadBox->pack( exitButton );
+
+  deadBox->showAll();
+}

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

@@ -9 +9 @@
 
 #include "playable.h"
+#include "glgui.h"
 
 
@@ -76 +77 @@
     FPSSniperRifle*       weapon;
     
+    OM_LIST myList;
+    OrxGui::GLGuiBox* deadBox;
+    void onButtonContinue();
+    void onButtonExit();
+    void showDeadScreen();
+    
 };
 

branches/presentation/src/world_entities/npcs/adm_turret.cc

@@ -174 +174 @@
       dv2.normalize();
       float angle = dv1.dot(dv2);
-      if (angle > 0.999)
+      if ( angle > 0.999 && this->myTarget->getOMListNumber()!=OM_DEAD )
       {
         if (this->weapon) this->weapon->fire(true);

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

@@ -100 +100 @@
   }
 
-  PRINTF(0)("entity: %s\n", nearestEntity->getClassCName());
-    return nearestEntity;
+  return nearestEntity;
 }
 

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

@@ -170 +170 @@
   if ( shortestDist < (pos - target->getAbsCoor()).len() )
   {
+
+#ifdef DEBUG_AIMING
     printf("HIT WALL\n");
-#ifdef DEBUG_AIMING
     this->debugDist = shortestDist;
 #endif
@@ -190 +191 @@
     if (r < p )
     {
+#ifdef DEBUG_AIMING
       printf( "HIT %s\n", target->getClassName().c_str() );
+#endif
       target->hit( this->damage, this );
     }
+#ifdef DEBUG_AIMING
     else
       printf( "MISHIT %s\n", target->getClassName().c_str() );
+#endif
 
   }
   else
   {
+#ifdef DEBUG_AIMING
     printf( "HIT %s\n", target->getClassName().c_str() );
+#endif
     target->hit( this->damage, this );
   }
@@ -217 +224 @@
     (*it)->draw();
   }
-#if 1
+#ifdef DEBUG_AIMING
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -231 +238 @@
   Vector mp = this->getAbsCoor();
   Vector op = this->getAbsDir().apply( Vector(1, 0, 0) );
-#ifdef DEBUG_AIMING
+
   op *= debugDist;
-#else
-  op *= 1000;
-#endif
   op += mp;
 

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

@@ -154 +154 @@
 void FPSSniperRifle::fire()
 {
-  PRINTF(0)("sniper fire\n");
   this->bFire = true;
 }
@@ -193 +192 @@
   this->weapon->fire( bFire );
   
-  if ( bFire ){
-      PRINTF(0)("REAL FIRE\n");
-  }
   bFire = false;
 }

branches/presentation/src/world_entities/world_entity.cc

@@ -990 +990 @@
 void WorldEntity::hit(float damage, WorldEntity* killer)
 {
-  PRINTF(0)("TESTS: %i %i %i\n", (forwardDamageToParent), (this->getParent() != NullParent::getNullParent()), (this->getParent()->isA( WorldEntity::staticClassID() )));
   if ( forwardDamageToParent && this->getParent() != NullParent::getNullParent() && this->getParent()->isA( WorldEntity::staticClassID() ) )
   {
@@ -1004 +1003 @@
   
   this->decreaseHealth(damage);
-
-  PRINTF(0)("Hit me: %s::%s now only %f/%f health\n", this->getClassCName(), this->getCName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)