Fix clearKeyModState and remove m_lastModState to simplify modstatechanged recognition

Author: xezon

GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h

@@ -431,8 +431,6 @@ class MetaEventTranslator : public GameMessageTranslator
 		UnsignedByte m_modStateBits; ///< Fits all combinations of CTRL+ALT+SHIFT, storing 1 bit for each
 	};
 
-	Int m_lastModState;	// really a MappableKeyModState
-
 	KeyDownInfo m_keyDownInfos[KEY_COUNT];
 
 	enum { NUM_MOUSE_BUTTONS = 3 };

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp

@@ -377,8 +377,7 @@ static const FieldParse TheMetaMapFieldParseTable[] =
 // PUBLIC FUNCTIONS ///////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------------------
-MetaEventTranslator::MetaEventTranslator() :
-	m_lastModState(0)
+MetaEventTranslator::MetaEventTranslator()
 {
 	for (Int i = 0; i < NUM_MOUSE_BUTTONS; ++i) {
 		m_nextUpShouldCreateDoubleClick[i] = FALSE;
@@ -438,7 +437,10 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 
 	if (t == GameMessage::MSG_RAW_KEY_DOWN || t == GameMessage::MSG_RAW_KEY_UP)
 	{
-		Int systemKey = msg->getArgument(0)->integer;
+		const Int systemKey = msg->getArgument(0)->integer;
+		const Int keyState = msg->getArgument(1)->integer;
+
+		MappableKeyType key = (MappableKeyType)systemKey;
 		switch (systemKey)
 		{
 		case KEY_LCTRL:
@@ -447,10 +449,8 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 		case KEY_RSHIFT:
 		case KEY_LALT:
 		case KEY_RALT:
-			systemKey = KEY_NONE;
+			key = MK_NONE;
 		}
-		const MappableKeyType key = (MappableKeyType)systemKey;
-		const Int keyState = msg->getArgument(1)->integer;
 
 		// for our purposes here, we don't care to distinguish between right and left keys,
 		// so just fudge a little to simplify things.
@@ -471,7 +471,7 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 			newModState |= ALT;
 		}
 
-		const Bool modStateRemoved = newModState < m_lastModState;
+		const Bool modStateRemoved = (key == MK_NONE) && (t == GameMessage::MSG_RAW_KEY_UP);
 
 		if (modStateRemoved)
 		{
@@ -576,8 +576,6 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 			}
 		}
 
-		}
-
 		if (t == GameMessage::MSG_RAW_KEY_DOWN)
     {
 #ifdef DUMP_ALL_KEYS_TO_LOG
@@ -599,12 +597,14 @@ GameMessageDisposition MetaEventTranslator::translateGameMessage(const GameMessa
 		{
 			if (newModState != NONE)
 			{
+				DEBUG_ASSERTCRASH(key != MK_NONE, ("Key is expected to be not MK_NONE"));
+
 				// Forget that this key and mod state are pressed.
 				m_keyDownInfos[key].clearKeyModState((MappableKeyModState)newModState);
 			}
 		}
 
-    m_lastModState = newModState;
+		}
 	}