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

Timestamp:

Jun 22, 2006, 12:48:01 PM (19 years ago)

Author:

bensch

Message:

merged network back
merged with command:
svn merge -r8625:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

Location:

trunk/src/util

Files:

• multiplayer_team_deathmatch.cc (modified) (5 diffs)
• multiplayer_team_deathmatch.h (modified) (3 diffs)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -43 +43 @@
 
 #include "story_entity.h"
+
+#include "shell_command.h"
 
 
@@ -80 +82 @@
   
   subscribeEvent( ES_GAME, SDLK_o );
+  subscribeEvent( ES_GAME, SDLK_TAB );
+  
+  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);
+  this->input->connect(SIGNAL(input, enterPushed), this, SLOT(MultiplayerTeamDeathmatch, onInputEnter));
 }
 
@@ -91 +103 @@
   
   unsubscribeEvent( ES_GAME, SDLK_o );
+  unsubscribeEvent( ES_GAME, SDLK_TAB );
+  
+  if ( this->notifier )
+  {
+    delete this->notifier;
+    this->notifier = NULL;
+  }
+  
+  if ( this->input )
+  {
+    delete this->input;
+    this->input = NULL;
+  }
 }
 
@@ -539 +564 @@
       this->bShowTeamChange = true;
   }
+  else if ( event.type == SDLK_TAB )
+  {
+    if ( !event.bPressed )
+    {
+      EventHandler::getInstance()->pushState( ES_MENU );
+      OrxGui::GLGuiHandler::getInstance()->activateCursor();
+      OrxGui::GLGuiHandler::getInstance()->deactivateCursor();
+      input->show();
+      input->giveFocus();
+      input->setText("say ");
+    }
+  }
 }
 
@@ -563 +600 @@
   }
   
-  PRINTF(0)("CHATMESSAGE %s: %s\n", name.c_str(), message.c_str() );
-}
-
-
-
-
+  PRINTF(0)("CHATMESSAGE %s (%d): %s\n", name.c_str(), userId, message.c_str() );
+  notifier->pushNotifyMessage(name + ": " + message);
+}
+
+void MultiplayerTeamDeathmatch::onInputEnter( const std::string & text )
+{
+  EventHandler::getInstance()->popState();
+  input->breakFocus();
+  input->hide();
+  input->setText("");
+
+  std::string command = text;
+ 
+  //HACK insert " in say commands so user doesn't have to type them
+  if ( command.length() >= 4 && command[0] == 's' && command[1] == 'a' && command[2] == 'y' && command[3] == ' ' )
+  {
+    command.insert( 4, "\"" );
+    command = command + "\"";
+  }
+
+  OrxShell::ShellCommand::execute( command );
+}
+
+
+
+

trunk/src/util/multiplayer_team_deathmatch.h

@@ -13 +13 @@
 
 #include "glgui.h"
+#include "specials/glgui_notifier.h"
 
 class TiXmlElement;
@@ -82 +83 @@
     OrxGui::GLGuiBox* box;
     
+    OrxGui::GLGuiNotifier* notifier;
+    OrxGui::GLGuiInputLine* input;
+    
     void calculateTeamScore();
     void nextGameState();
@@ -94 +98 @@
     void onButtonCancel();
     void onButtonExit();
+    
+    void onInputEnter( const std::string & text );
 };