1 files changed, 11 insertions, 24 deletions

diff --git a/src/client/console.cc b/src/client/console.cc
index a09272a..c5feb86 100644
--- a/src/client/console.cc
+++ b/src/client/console.cc
@@ -4,18 +4,19 @@
    the terms and conditions of the GNU General Public License version 2 
 */
 
-#include "client/console.h"
+#include <iostream>
+#include <fstream>
+#include <cmath>
+
 #include "auxiliary/functions.h"
+#include "client/chat.h"
+#include "client/console.h"
+#include "client/video.h"
+#include "client/keyboard.h"
 #include "core/core.h"
 #include "filesystem/filesystem.h"
 #include "render/render.h"
 #include "render/textures.h"
-#include "client/video.h"
-#include "client/keyboard.h"
-
-#include <iostream>
-#include <fstream>
-#include <cmath>
 
 namespace client {
 
@@ -25,22 +26,12 @@ Console *console() {
 	return &client_console;
 }
 
-//--- engine functions --------------------------------------------
-
-void func_ui_console(std::string const &args)
-{
-	
-	console()->toggle();
-}
-
 //--- public ------------------------------------------------------
 
 void Console::init()
 {
 	con_print << "^BInitializing console..." << std::endl;	
 
-	core::Func *func = core::Func::add("ui_console", (core::FuncPtr) func_ui_console);
-	func->set_info("toggle console on or off");
 	console()->load_history();
 }
 
@@ -49,9 +40,6 @@ void Console::shutdown()
 	con_print << "^BShutting down console..." << std::endl;
 
 	console()->save_history();
-
-	// remove engine functions
-	core::Func::remove("ui_console");
 }
 
 //--- Console -----------------------------------------------------
@@ -102,13 +90,12 @@ void Console::toggle()
 	} else {
 		SDL_WM_GrabInput(SDL_GRAB_ON);
 		SDL_ShowCursor(SDL_DISABLE);
-		//clear_notify();
 	}
-	
-	setkeyboardmode(visible());
+
+	setkeyboardmode(console()->visible() || (core::application()->connected() && chat::visible()));
 }
 
-void Console::keypressed(int key)
+void Console::keypressed(unsigned int key)
 {
 	std::deque<std::string>::reverse_iterator upit;