Changeset 8635 in orxonox.OLD

Timestamp:

Jun 20, 2006, 3:38:37 PM (18 years ago)

Author:

rennerc

Message:

mini shell works

Location:

branches/network/src

Files:

• lib/network/message_manager.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (5 diffs)
• util/multiplayer_team_deathmatch.h (modified) (3 diffs)

branches/network/src/lib/network/message_manager.cc

@@ -328 +328 @@
 
       it->second.messages.push_back( msg );
-      
-     
     }
   }

branches/network/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->input = new OrxGui::GLGuiInputLine();
+  this->input->connect(SIGNAL(input, enterPushed), this, SLOT(MultiplayerTeamDeathmatch, onInputEnter));
 }
 
@@ -91 +100 @@
   
   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 +561 @@
       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 ");
+    }
+  }
 }
 
@@ -564 +598 @@
   
   PRINTF(0)("CHATMESSAGE %s: %s\n", name.c_str(), message.c_str() );
-}
-
-
-
-
+  notifier->pushNotifyMessage(name + ": " + message);
+}
+
+void MultiplayerTeamDeathmatch::onInputEnter( const std::string & text )
+{
+  EventHandler::getInstance()->popState();
+  input->breakFocus();
+  input->hide();
+  input->setText("");
+  
+  OrxShell::ShellCommand::execute( text );
+}
+
+
+
+

branches/network/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 );
 };