Changeset 6791

Timestamp:

Apr 26, 2010, 4:35:31 PM (14 years ago)

Author:

smerkli

Message:

Chat works lowlevel, shortcut is set to B. needs ui now.

Location:

code/branches/chat

Files:

• data/defaultConfig/keybindings.ini (modified) (1 diff)
• src/orxonox/ChatInputHandler.cc (modified) (3 diffs)
• src/orxonox/ChatInputHandler.h (modified) (2 diffs)

code/branches/chat/data/defaultConfig/keybindings.ini

@@ -7 +7 @@
 KeyApostrophe=
 KeyApps=
-KeyB=
+KeyB =
 KeyBack=
 KeyBackslash=

code/branches/chat/src/orxonox/ChatInputHandler.cc

@@ -37 +37 @@
   /* singleton */
   ManageScopedSingleton( ChatInputHandler, ScopeID::Graphics, false );
+  SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
+    true );
 
   /* constructor */
@@ -50 +52 @@
 
     /* configure the input buffer */
-                configureInputBuffer();
+    configureInputBuffer();
 
     this->inputState = InputManager::getInstance().createInputState( "chatinput", false, false, InputStatePriority::Dynamic );
     this->inputState->setKeyHandler(this->inpbuf);
 
-    /* set console shortcut */
-    this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(
-      &ChatInputHandler::activate, this), "startchat"), false);
+    //[> set console shortcut <]
+    //this->getIdentifier()->addConsoleCommand(createConsoleCommand(createFunctor(
+      //&ChatInputHandler::activate, this), "startchat"), false);
   }
 
@@ -88 +90 @@
 
   /* activate, deactivate */
+  void ChatInputHandler::activate_static()
+  { ChatInputHandler::getInstance().activate(); }
+  
   void ChatInputHandler::activate()
   {

code/branches/chat/src/orxonox/ChatInputHandler.h

@@ -39 +39 @@
 /* project includes */
 #include <OrxonoxPrereqs.h>
+#include <core/BaseObject.h>
+#include <core/PathConfig.h>
+
 #include "core/input/InputBuffer.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
+
 #include "../libraries/network/Host.h"
-#include <core/BaseObject.h>
-#include <PlayerManager.h>
-#include <infos/PlayerInfo.h>
-#include <network/ChatListener.h>
-#include <core/PathConfig.h>
 #include <util/Singleton.h>
 
@@ -78 +77 @@
 
       /* start listening, stop listening */
+      static void activate_static();
       void activate();
       void deactivate();