OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix the bugs I introduced by accidentally merging my own pull request.

Browse Source
This commit is contained in:
Adam Johnson
2011-08-27 16:24:54 -04:00
parent 109e389178
commit da1ca0d91c
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
View File

@ -131,15 +131,6 @@ class pfConsoleInputInterface : public plInputInterface
{ {
if( fConsole->fMode ) if( fConsole->fMode )
{ {
// If this is a character input, do not accept the codes (yes, the code) that will toggle
// the console--that's handled elsewhere...
if ( keyMsg->GetKeyChar() )
{
const plKeyBinding* keyb = fControlMap->FindBinding( B_SET_CONSOLE_MODE );
if ( keyb->GetKey1().fKey == keyMsg->GetKeyCode() )
return true;
}
fConsole->IHandleKey( keyMsg ); fConsole->IHandleKey( keyMsg );
return true; return true;
} }

7
Sources/Plasma/PubUtilLib/plInputCore/plInputInterface.cpp
View File

@ -132,8 +132,6 @@ hsBool plInputInterface::ProcessKeyBindings( plInputEventMsg *msg )
plKeyEventMsg *keyMsg = plKeyEventMsg::ConvertNoRef( msg ); plKeyEventMsg *keyMsg = plKeyEventMsg::ConvertNoRef( msg );
if( keyMsg == nil ) if( keyMsg == nil )
return false; return false;
if ( keyMsg->GetKeyChar())
return false;
/// We might have controls that are currently enabled that are triggered in part by /// We might have controls that are currently enabled that are triggered in part by
@ -272,6 +270,11 @@ hsBool plInputInterface::ProcessKeyBindings( plInputEventMsg *msg )
} }
} }
// Still here? Only proces bound keys for KEYDOWNS.
// We'll pretend to process CHARs so they don't get sent on...
if ( keyMsg->GetKeyChar() )
return true;
/// OK, generate the message to send /// OK, generate the message to send
plCtrlCmd *pCmd = TRACKED_NEW plCtrlCmd( this ); plCtrlCmd *pCmd = TRACKED_NEW plCtrlCmd( this );
pCmd->fControlCode = binding->GetCode(); pCmd->fControlCode = binding->GetCode();