From 415360fc4ab6aa3ce0c12c20b4fe6f8aacf9d7c5 Mon Sep 17 00:00:00 2001 From: Derrick Renaud Date: Mon, 20 Apr 2009 16:24:47 +0000 Subject: [PATCH] removed a DirectX gun change that was not meant to be committed with my last update. --- src/osd/windows/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index 0d356f65cf7..72651deb517 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -1425,9 +1425,10 @@ static BOOL CALLBACK dinput_mouse_enum(LPCDIDEVICEINSTANCE instance, LPVOID ref) const char *name = dinput_device_item_name(devinfo, offset, default_button_name(butnum), NULL); // add to the mouse device and optionally to the gun device as well + // note that the gun device points to the mouse buttons rather than its own input_device_item_add(devinfo->device, name, &devinfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state); if (guninfo != NULL) - input_device_item_add(guninfo->device, name, &guninfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state); + input_device_item_add(guninfo->device, name, &devinfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state); free((void *)name); }