Changeset 9023 in orxonox.OLD

Timestamp:

Jul 2, 2006, 11:16:47 PM (18 years ago)

Author:

rennerc

Message:

MultiPlayerTeamDeathMatch: use hud notifier instead of own

Location:

branches/multi_player_map/src

Files:

• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• util/multiplayer_team_deathmatch.h (modified) (1 diff)
• world_entities/player.h (modified) (1 diff)

branches/multi_player_map/src/util/multiplayer_team_deathmatch.cc

@@ -86 +86 @@
   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);
@@ -106 +101 @@
   unsubscribeEvent( ES_MENU, SDLK_F1 );
   unsubscribeEvent( ES_MENU, KeyMapper::PEV_FIRE1 );
-
-  if ( this->notifier )
-  {
-    delete this->notifier;
-    this->notifier = NULL;
-  }
 
   if ( this->input )
@@ -597 +586 @@
 
   PRINTF(0)("CHATMESSAGE %s (%d): %s\n", name.c_str(), userId, message.c_str() );
-  notifier->pushNotifyMessage(name + ": " + message);
+  State::getPlayer()->getHud().notifyUser(name + ": " + message);
 }
 

branches/multi_player_map/src/util/multiplayer_team_deathmatch.h

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

branches/multi_player_map/src/world_entities/player.h

@@ -31 +31 @@
     bool              eject();
     inline Playable*  getPlayable() const  { return this->playable; };
+    
 
-//     inline Hud& hud() { return this->_hud; };
+     inline Hud& getHud() { return this->hud; };
 //     inline const Hud& hud() const { return this->_hud; };