update

Author: madebr

LEGORacers/include/inputdevice.h

@@ -6,21 +6,29 @@
 
 class OpalVault0xf0;
 
+class InputDevice;
+
+class InputCallback {
+public:
+	virtual void OnKeyDown(InputDevice& p_device, undefined2 p_keyCode) = 0;
+	virtual void OnKeyUp(InputDevice& p_device, undefined2 p_keyCode) = 0;
+};
+
 // VTABLE: LEGORACERS 0x004b0e9c
 // SIZE 0x9c
 class InputDevice {
 public:
 	InputDevice();
 	virtual void VTable0x00();
-	virtual void VTable0x04(undefined4, LegoBool p_arg2, undefined4);
+	virtual void VTable0x04(undefined4, LegoBool p_arg2, LegoBool32);
 	virtual void VTable0x08(undefined4, undefined4) = 0;
 	virtual ~InputDevice();
 	virtual LegoBool32 VTable0x10();
 	virtual undefined4 VTable0x14(undefined4);
 	virtual undefined4 VTable0x18();
-	virtual undefined4 VTable0x1c();
+	virtual LegoS32 VTable0x1c();
 	virtual undefined4 VTable0x20();
-	virtual const LegoChar* VTable0x24(undefined4);
+	virtual undefined2* VTable0x24(undefined4);
 	virtual void VTable0x28(undefined4) = 0;
 	virtual LegoFloat VTable0x2c() = 0;
 	virtual LegoFloat VTable0x30() = 0;
@@ -34,7 +42,7 @@ class InputDevice {
 	virtual undefined4 VTable0x50();
 	virtual undefined4 VTable0x54();
 	virtual LegoBool32 VTable0x58() = 0;
-	virtual LegoBool32 VTable0x5c() = 0;
+	virtual LegoS32 VTable0x5c() = 0;
 	virtual LegoBool32 VTable0x60() = 0;
 
 	void FUN_0044b9f0();
@@ -43,22 +51,18 @@ class InputDevice {
 	void FUN_0044baf0(undefined2* p_arg1, undefined2* p_arg2);
 	undefined2* FUN_0044bb20();
 	undefined2* FUN_0044bb40();
-	void FUN_0044bb40(LegoFloat, LegoFloat, undefined4);
 	void FUN_0044bc60(undefined4);
 	void FUN_0044bda0();
 	void FUN_0044bdd0(undefined4 p_arg1, undefined p_arg2);
-	void FUN_0044bdf0(undefined4);
+	void FUN_0044bdf0(undefined4 p_arg);
 	LegoBool32 FUN_0044be10(undefined4);
 	undefined2 FUN_0044be70(const LegoChar*);
 
 	// SYNTHETIC: LEGORACERS 0x0044b920
 	// InputDevice::`scalar deleting destructor'
 
 protected:
-	undefined4 m_unk0x04;             // 0x04
-	undefined4 m_unk0x08;             // 0x08
-	undefined4 m_unk0x0c;             // 0x0c
-	undefined4 m_unk0x10;             // 0x10
+	undefined4 m_unk0x04[4];          // 0x04
 	OpalVault0xf0* m_opalVault;       // 0x14
 	LegoBool32 m_unk0x18;             // 0x18
 	undefined4 m_unk0x1c;             // 0x1c
@@ -72,17 +76,17 @@ class InputDevice {
 	undefined4 m_unk0x3c;             // 0x3c
 	undefined4 m_unk0x40;             // 0x40
 	undefined4 m_unk0x44;             // 0x44
-	undefined4 m_unk0x48;             // 0x48
-	undefined4 m_unk0x4c;             // 0x4c
+	undefined4 m_buttonCount;         // 0x48
+	undefined4 m_axisCount;           // 0x4c
 	LegoS32 m_unk0x50;                // 0x50
-	undefined4 m_unk0x54;             // 0x54
-	undefined4 m_unk0x58;             // 0x58
+	undefined4 m_devSubType;          // 0x54
+	undefined4 m_devType;             // 0x58
 	undefined4 m_unk0x5c;             // 0x5c
 	LegoChar m_unk0x60[32];           // 0x60
 	undefined m_unk0x80[0x90 - 0x80]; // 0x80
 	undefined4 m_unk0x90;             // 0x90
-	undefined4 m_unk0x94;             // 0x94
-	undefined4 m_unk0x98;             // 0x98
+	undefined2* m_unk0x94;            // 0x94
+	InputCallback* m_callback;        // 0x98
 };
 
 #include "compat.h"
@@ -111,7 +115,7 @@ class CommonInputDevice : public InputDevice {
 	~CommonInputDevice() override;
 	LegoBool32 VTable0x10() override;
 	undefined4 VTable0x14(undefined4) override;
-	const LegoChar* VTable0x24(undefined4) override;
+	undefined2* VTable0x24(undefined4) override;
 	LegoFloat VTable0x2c() override;
 	undefined4 VTable0x38() override;
 	undefined4 VTable0x3c() override;
@@ -122,7 +126,7 @@ class CommonInputDevice : public InputDevice {
 	undefined4 VTable0x50() override;
 	undefined4 VTable0x54() override;
 	LegoBool32 VTable0x58() override;
-	LegoBool32 VTable0x5c() override;
+	LegoS32 VTable0x5c() override;
 	LegoBool32 VTable0x60() override;
 	virtual LegoBool32 VTable0x64(CreateDinputDeviceParams* p_params);
 	virtual void VTable0x68(const DIDEVICEOBJECTDATA& p_data) = 0;
@@ -136,14 +140,14 @@ class CommonInputDevice : public InputDevice {
 	void FUN_0044fa50();
 	void FUN_0044faa0();
 	void FUN_0044fb30();
-	undefined4 FUN_0044fda0();
+	undefined4 FUN_0044fda0(const GUID& p_guid) const;
 	LegoBool32 FUN_0044fef0();
 	undefined4 FUN_00450170(HRESULT p_hResult);
 
 	undefined4 m_unk0x9c;           // 0x9c
 	LPDIRECTINPUTDEVICE2A m_device; // 0xa0
 	HWND m_hWnd;                    // 0xa4
-	undefined4 m_unk0xa8;           // 0xa8
+	LPDIRECTINPUTEFFECT m_effect;   // 0xa8
 	undefined4 m_unk0xac;           // 0xac
 	GUID m_deviceGuid;              // 0xb0
 	DWORD m_cooperativeLevel;       // 0xc0
@@ -158,10 +162,10 @@ class KeyboardInputDevice : public CommonInputDevice {
 	KeyboardInputDevice();
 
 	void VTable0x00() override;
-	void VTable0x04(undefined4, LegoBool, undefined4) override;
+	void VTable0x04(undefined4, LegoBool, LegoBool32) override;
 	void VTable0x08(undefined4, undefined4) override;
 	~KeyboardInputDevice() override;
-	undefined4 VTable0x1c() override;
+	LegoS32 VTable0x1c() override;
 	undefined4 VTable0x20() override;
 	void VTable0x28(undefined4) override;
 	LegoFloat VTable0x30() override;