From 49ea23c532cb0d8ab6e27d290484a1e2daadb347 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 5 Aug 2010 10:16:21 +0000 Subject: SWORD25: Fix for void * conversion errors It turns out that strict C++ doesn't allow function pointers to be converted to void pointers and vice versa. Since there are two callback function pointer types - one with a KEY_COMMANDS enum parameter, and the other with an unsigned char type, I changed all void * occurances to a function pointer type with an 'int' parameter, and changed all implementation methods to take in an int parameter. svn-id: r53208 --- engines/sword25/input/scummvminput.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/sword25/input/scummvminput.h') diff --git a/engines/sword25/input/scummvminput.h b/engines/sword25/input/scummvminput.h index a26060f4ab..b38a54b757 100644 --- a/engines/sword25/input/scummvminput.h +++ b/engines/sword25/input/scummvminput.h @@ -65,10 +65,10 @@ public: virtual bool WasKeyDown(unsigned int KeyCode); virtual void SetMouseX(int PosX); virtual void SetMouseY(int PosY); - virtual bool RegisterCharacterCallback(CharacterCallback Callback); - virtual bool UnregisterCharacterCallback(CharacterCallback Callback); - virtual bool RegisterCommandCallback(CommandCallback Callback); - virtual bool UnregisterCommandCallback(CommandCallback Callback); + virtual bool RegisterCharacterCallback(CallbackPtr Callback); + virtual bool UnregisterCharacterCallback(CallbackPtr Callback); + virtual bool RegisterCommandCallback(CallbackPtr Callback); + virtual bool UnregisterCommandCallback(CallbackPtr Callback); virtual void ReportCharacter(unsigned char Character); virtual void ReportCommand(KEY_COMMANDS Command); -- cgit v1.2.3