TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 15:30:41 +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 void setModifierKeys(U8 mod) {smModifierKeys = mod;}
static void attemptSwitchToKeyboardLayout( U32 layout );
#ifdef LOG_INPUT
static void log( const char* format, ... );
#endif

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

@ -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, ... )

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
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)
{