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

Timestamp:

Jul 3, 2006, 6:30:42 PM (18 years ago)

Author:

patrick

Message:

merged the network branche with the trunk

Location:

trunk/src/util

Files:

• multiplayer_team_deathmatch.cc (modified) (8 diffs)
• multiplayer_team_deathmatch.h (modified) (1 diff)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -83 +83 @@
   subscribeEvent( ES_GAME, SDLK_TAB );
   subscribeEvent( ES_GAME, SDLK_F1 );
-  subscribeEvent( ES_MENU, SDLK_F1 );
   subscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
 
-  this->notifier = new OrxGui::GLGuiNotifier();
-  this->notifier->show();
-  this->notifier->setAbsCoor2D(5, 30);
-  this->notifier->setFadeAge( 6.0 );
-  this->notifier->setHideAge( 8.0 );
   this->input = new OrxGui::GLGuiInputLine();
   this->input->setAbsCoor2D(180, 5);
@@ -104 +98 @@
   unsubscribeEvent( ES_GAME, SDLK_TAB );
   unsubscribeEvent( ES_GAME, SDLK_F1 );
-  unsubscribeEvent( ES_MENU, SDLK_F1 );
   unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
-
-  if ( this->notifier )
-  {
-    delete this->notifier;
-    this->notifier = NULL;
-  }
 
   if ( this->input )
@@ -308 +295 @@
 
   if ( team == 0 || team == 1 )
-    return CL_SPACE_SHIP;
+    return CL_FPS_PLAYER;
 
   assert( false );
@@ -316 +303 @@
 {
   if ( team == 0 )
-    return "models/ships/reap_#.obj";
+    return "models/creatures/doom_guy.md2";
   else if ( team == 1 )
-    return "models/ships/fighter.obj";
+    return "models/creatures/doom_guy.md2";
   else
     return "";
@@ -545 +532 @@
   } else if ( event.type == SDLK_F1 )
   {
+    if ( this->statsBox && !this->bLocalPlayerDead && event.bPressed )
+    {
+      PRINTF(0)("hide stats\n");
+      this->hideStats();
+    }
     if ( !this->statsBox && event.bPressed )
     {
       PRINTF(0)("show stats\n");
       this->showStats();
-    }
-    if ( this->statsBox && !this->bLocalPlayerDead && event.bPressed && this->table->rowCount() != 0 && this->table->columnCount() != 0 )
-    {
-      PRINTF(0)("hide stats\n");
-      this->hideStats();
     }
   }
@@ -597 +584 @@
 
   PRINTF(0)("CHATMESSAGE %s (%d): %s\n", name.c_str(), userId, message.c_str() );
-  notifier->pushNotifyMessage(name + ": " + message);
+  State::getPlayer()->hud().notifyUser(name + ": " + message);
 }
 
@@ -624 +611 @@
 void MultiplayerTeamDeathmatch::showStats( )
 {
-  EventHandler::getInstance()->pushState( ES_MENU );
   statsBox = new OrxGui::GLGuiBox();
   statsBox->setAbsCoor2D( 300, 100 );
 
-  this->table = new OrxGui::GLGuiTable(0,0);
+  this->table = new OrxGui::GLGuiTable(5,5);
 
   statsBox->pack( this->table );
@@ -645 +631 @@
       statsBox = NULL;
     }
-
-    EventHandler::getInstance()->popState();
 }
 

trunk/src/util/multiplayer_team_deathmatch.h

@@ -83 +83 @@
     OrxGui::GLGuiBox* box;
     
-    OrxGui::GLGuiNotifier* notifier;
     OrxGui::GLGuiInputLine* input;