TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted #540

Browse source
This commit is contained in:
Daniel Buckmaster 2014-07-14 15:13:30 +02:00
parent ceccd06198
commit b7c720d01d
5 changed files with 2 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/platform/platformInput.h
View file

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

18
Engine/source/platformWin32/winInput.cpp
View file

@ -33,8 +33,6 @@
#include <stdarg.h> #include <stdarg.h>
#endif #endif
#include <sstream>
// Static class variables: // Static class variables:
InputManager* Input::smManager; InputManager* Input::smManager;
bool Input::smActive; bool Input::smActive;
@ -81,10 +79,6 @@ void Input::init()
destroy(); destroy();
#ifdef TORQUE_DEFAULT_KEYBOARD_LAYOUT
attemptSwitchToKeyboardLayout( TORQUE_DEFAULT_KEYBOARD_LAYOUT );
#endif
#ifdef LOG_INPUT #ifdef LOG_INPUT
struct tm* newTime; struct tm* newTime;
time_t aclock; time_t aclock;
@ -493,18 +487,6 @@ InputManager* Input::getManager()
return( smManager ); 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 #ifdef LOG_INPUT
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void Input::log( const char* format, ... ) void Input::log( const char* format, ... )

8
Engine/source/sim/actionMap.cpp
View file

@ -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 // Now we need to map the key string to the proper KEY code from event.h
AssertFatal( //
dStrlen( pObjectString ) > 0, AssertFatal(dStrlen(pObjectString) != 0, "Error, no key was specified!");
"Error, no key was specified!\n"
"Review file 'scripts/client/config.cs' and remove symbols"
" which is not latin. Or delete this file."
);
if (dStrlen(pObjectString) == 1) if (dStrlen(pObjectString) == 1)
{ {

7
Templates/Empty/source/torqueConfig.h
View file

@ -148,13 +148,6 @@
/// texture manager. /// texture manager.
#define TORQUE_FRAME_SIZE 16 << 20 #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 // Finally, we define some dependent #defines. This enables some subsidiary
// functionality to get automatically turned on in certain configurations. // functionality to get automatically turned on in certain configurations.

7
Templates/Full/source/torqueConfig.h
View file

@ -169,13 +169,6 @@
/// texture manager. /// texture manager.
#define TORQUE_FRAME_SIZE 16 << 20 #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 // Finally, we define some dependent #defines. This enables some subsidiary
// functionality to get automatically turned on in certain configurations. // functionality to get automatically turned on in certain configurations.