Merge pull request #732 from eightyeight/revert-540

Revert #540

Engine/source/platform/platformInput.h

@@ -118,9 +118,6 @@ public:
 
    static U8 getModifierKeys() {return smModifierKeys;}
    static void setModifierKeys(U8 mod) {smModifierKeys = mod;}
-
-   static void attemptSwitchToKeyboardLayout( U32 layout );
-
 #ifdef LOG_INPUT
    static void log( const char* format, ... );
 #endif

Engine/source/platformWin32/winInput.cpp

@@ -33,8 +33,6 @@
 #include <stdarg.h>
 #endif
 
-#include <sstream>
-
 // Static class variables:
 InputManager*  Input::smManager;
 bool           Input::smActive;
@@ -81,10 +79,6 @@ void Input::init()
 
    destroy();
 
-#ifdef TORQUE_DEFAULT_KEYBOARD_LAYOUT
-   attemptSwitchToKeyboardLayout( TORQUE_DEFAULT_KEYBOARD_LAYOUT );
-#endif
-
 #ifdef LOG_INPUT
    struct tm* newTime;
    time_t aclock;
@@ -493,18 +487,6 @@ InputManager* Input::getManager()
    return( smManager );
 }
 
-//------------------------------------------------------------------------------
-void Input::attemptSwitchToKeyboardLayout( U32 layout )
-{
-   const LANGID lang = MAKELANGID( layout, SUBLANG_DEFAULT );
-   std::wstringstream ss;
-   ss << std::hex << lang;
-   const wchar_t* hexLang = ss.str().c_str();
-   ActivateKeyboardLayout( LoadKeyboardLayout(
-       hexLang,  KLF_ACTIVATE | KLF_REPLACELANG
-   ), KLF_REORDER );
-}
-
 #ifdef LOG_INPUT
 //------------------------------------------------------------------------------
 void Input::log( const char* format, ... )

Engine/source/sim/actionMap.cpp

@@ -458,12 +458,8 @@ bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor*
    }
 
    // Now we need to map the key string to the proper KEY code from event.h
-   AssertFatal(
-       dStrlen( pObjectString ) > 0,
-       "Error, no key was specified!\n"
-       "Review file 'scripts/client/config.cs' and remove symbols"
-       " which is not latin. Or delete this file."
-   );
+   //
+   AssertFatal(dStrlen(pObjectString) != 0, "Error, no key was specified!");
 
    if (dStrlen(pObjectString) == 1)
    {

Templates/Empty/source/torqueConfig.h

@@ -148,13 +148,6 @@
 /// texture manager.
 #define TORQUE_FRAME_SIZE     16 << 20
 
-// Default keyboard layout for launching the game. It's fixed crash when a
-// game running with the extend unicode keyboard (cyrillic, for example).
-// Windows only.
-// @see For choice language >
-//      http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85%29.aspx
-#define TORQUE_DEFAULT_KEYBOARD_LAYOUT  LANG_ENGLISH
-
 // Finally, we define some dependent #defines. This enables some subsidiary
 // functionality to get automatically turned on in certain configurations.
 

Templates/Full/source/torqueConfig.h

@@ -169,13 +169,6 @@
 /// texture manager.
 #define TORQUE_FRAME_SIZE     16 << 20
 
-// Default keyboard layout for launching the game. It's fixed crash when a
-// game running with the extend unicode keyboard (cyrillic, for example).
-// Windows only.
-// @see For choice language >
-//      http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693%28v=vs.85%29.aspx
-#define TORQUE_DEFAULT_KEYBOARD_LAYOUT  LANG_ENGLISH
-
 // Finally, we define some dependent #defines. This enables some subsidiary
 // functionality to get automatically turned on in certain configurations.