Revert "Removed unused ClientMessageProcessor and other small fixes"

This reverts commit 4019fed.

Author: ccw808

Client/core/CCore.cpp

@@ -135,6 +135,7 @@ CCore::CCore ( void )
 
     CCrashDumpWriter::SetHandlers();
 
+    m_pfnMessageProcessor       = NULL;
     m_pMessageBox = NULL;
 
     m_bFirstFrame = true;
@@ -658,6 +659,12 @@ void CCore::ForceCursorVisible ( bool bVisible, bool bToggleControls )
 }
 
 
+void CCore::SetMessageProcessor ( pfnProcessMessage pfnMessageProcessor )
+{
+    m_pfnMessageProcessor = pfnMessageProcessor;
+}
+
+
 void CCore::ShowMessageBox ( const char* szTitle, const char* szText, unsigned int uiFlags, GUI_CALLBACK * ResponseHandler )
 {
     RemoveMessageBox ();

Client/core/CCore.h

@@ -158,6 +158,7 @@ class CCore : public CCoreInterface, public CSingleton < CCore >
     // Mod
     void                    SetOfflineMod                   ( bool bOffline );
     void                    ForceCursorVisible              ( bool bVisible, bool bToggleControls = true );
+    void                    SetMessageProcessor             ( pfnProcessMessage pfnMessageProcessor );
     void                    ShowMessageBox                  ( const char* szTitle, const char* szText, unsigned int uiFlags, GUI_CALLBACK * ResponseHandler = NULL );
     void                    RemoveMessageBox                ( bool bNextFrame = false );
     void                    ShowErrorMessageBox             ( const SString& strTitle, SString strMessage, const SString& strTroubleLink = "" );
@@ -193,6 +194,8 @@ class CCore : public CCoreInterface, public CSingleton < CCore >
     HWND                    GetHookedWindow                 ( void );
     void                    SwitchRenderWindow              ( HWND hWnd, HWND hWndInput );
     void                    CallSetCursorPos                ( int X, int Y );
+    void                    SetClientMessageProcessor       ( pfnProcessMessage pfnMessageProcessor ) { m_pfnMessageProcessor = pfnMessageProcessor; };
+    pfnProcessMessage       GetClientMessageProcessor       ( void ) { return m_pfnMessageProcessor; }
     void                    ChangeResolution                ( long width, long height, long depth );
 
     bool                    IsFocused                       ( void )                        { return ( GetForegroundWindow ( ) == GetHookedWindow ( ) ); };
@@ -331,6 +334,7 @@ class CCore : public CCoreInterface, public CSingleton < CCore >
     bool                        m_bFirstFrame;
     bool                        m_bIsOfflineMod;
     bool                        m_bCursorToggleControls;
+    pfnProcessMessage           m_pfnMessageProcessor;
 
     CGUIMessageBox*             m_pMessageBox;
 

Client/core/CMessageLoopHook.cpp

@@ -424,11 +424,23 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage ( HWND hwnd,
             // Lead the message through the keybinds message processor
             g_pCore->GetKeyBinds ()->ProcessMessage ( hwnd, uMsg, wParam, lParam );
 
+            bool bProcessed = false, bClientProcessed = false;          
+
             // Check and see if the GUI should process this message
-            bool bProcessed = CLocalGUI::GetSingleton ().ProcessMessage ( hwnd, uMsg, wParam, lParam );
+            bProcessed = CLocalGUI::GetSingleton ().ProcessMessage ( hwnd, uMsg, wParam, lParam );
 
+            // Check and see if the Core/mod should process this message
+            if ( !CCore::GetSingleton ().GetGame ()->IsAtMenu() )
+            {            
+                pfnProcessMessage pfnClientMessageProcessor = CCore::GetSingleton ().GetClientMessageProcessor();
+                if ( pfnClientMessageProcessor )
+                {
+                    bClientProcessed = pfnClientMessageProcessor ( hwnd, uMsg, wParam, lParam );
+                }
+            }
+
             // If GTA can process this key
-            if ( !bProcessed )
+            if ( !bProcessed && !bClientProcessed )
             {
                 // ALWAYS return true on escape to stop us getting to GTA's menu
                 if ( uMsg == WM_KEYDOWN && wParam == VK_ESCAPE )

Client/core/CModManager.cpp

@@ -219,7 +219,8 @@ void CModManager::Unload ( void )
         CLocalGUI::GetSingleton ().GetDebugView ()->Clear ();
         CLocalGUI::GetSingleton ().SetDebugViewVisible ( false );
 
-        // NULL the unhandled command handler
+        // NULL the message processor and the unhandled command handler
+        CCore::GetSingleton ().SetClientMessageProcessor ( NULL );
         CCore::GetSingleton ().GetCommands ()->SetExecuteHandler ( NULL );
 
         // Reset cursor alpha

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -288,6 +288,7 @@ CClientGame::CClientGame ( bool bLocalPlay )
     g_pGame->SetPreWeaponFireHandler ( CClientGame::PreWeaponFire );
     g_pGame->SetPostWeaponFireHandler ( CClientGame::PostWeaponFire );
     g_pGame->SetTaskSimpleBeHitHandler ( CClientGame::StaticTaskSimpleBeHitHandler );
+    g_pCore->SetMessageProcessor ( CClientGame::StaticProcessMessage );
     g_pCore->GetKeyBinds ()->SetKeyStrokeHandler ( CClientGame::StaticKeyStrokeHandler );
     g_pCore->GetKeyBinds ()->SetCharacterKeyHandler ( CClientGame::StaticCharacterKeyHandler );
     g_pNet->RegisterPacketHandler ( CClientGame::StaticProcessPacket );
@@ -444,6 +445,7 @@ CClientGame::~CClientGame ( void )
     g_pGame->SetPostWeaponFireHandler ( NULL );
     g_pGame->SetTaskSimpleBeHitHandler ( NULL );
     g_pGame->GetAudio ()->SetWorldSoundHandler ( NULL );
+    g_pCore->SetMessageProcessor ( NULL );
     g_pCore->GetKeyBinds ()->SetKeyStrokeHandler ( NULL );
     g_pCore->GetKeyBinds ()->SetCharacterKeyHandler ( NULL );
     g_pNet->StopNetwork ();

Client/sdk/core/CCoreInterface.h

@@ -27,6 +27,8 @@
 #include "xml/CXML.h"
 #include <gui/CGUI.h>
 
+typedef bool (*pfnProcessMessage) ( HWND, UINT, WPARAM, LPARAM );
+
 class CMultiplayer;
 class CNet;
 class CGame;
@@ -113,6 +115,7 @@ class CCoreInterface
     virtual void                    ShowServerInfo                  ( unsigned int WindowType ) = 0;
 
     virtual void                    ForceCursorVisible              ( bool bVisible, bool bToggleControls = true ) = 0;
+    virtual void                    SetMessageProcessor             ( pfnProcessMessage pfnMessageProcessor ) = 0;
     virtual void                    ShowMessageBox                  ( const char* szTitle, const char* szText, unsigned int uiFlags, GUI_CALLBACK * ResponseHandler = NULL ) = 0;
     virtual void                    RemoveMessageBox                ( bool bNextFrame = false ) = 0;
     virtual void                    ShowErrorMessageBox             ( const SString& strTitle, SString strMessage, const SString& strTroubleLink = "" ) = 0;