mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Camilla Löwy 2017-01-12 05:30:56 +01:00
parent 0cd409bd6d
commit e7722af9a2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cocoa_joystick.m
View File

@ -274,13 +274,13 @@ static void matchCallback(void* context,
_GLFWjoystickNS* js; _GLFWjoystickNS* js;
int jid; int jid;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (_glfw.ns_js[jid].present && _glfw.ns_js[jid].deviceRef == deviceRef) if (_glfw.ns_js[jid].present && _glfw.ns_js[jid].deviceRef == deviceRef)
return; return;
} }
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (!_glfw.ns_js[jid].present) if (!_glfw.ns_js[jid].present)
break; break;
@ -336,7 +336,7 @@ static void removeCallback(void* context,
{ {
int jid; int jid;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (_glfw.ns_js[jid].deviceRef == deviceRef) if (_glfw.ns_js[jid].deviceRef == deviceRef)
{ {
@ -458,7 +458,7 @@ void _glfwTerminateJoysticksNS(void)
{ {
int jid; int jid;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
_GLFWjoystickNS* js = _glfw.ns_js + jid; _GLFWjoystickNS* js = _glfw.ns_js + jid;
removeJoystick(js); removeJoystick(js);

4
src/linux_joystick.c
View File

@ -53,7 +53,7 @@ static GLFWbool openJoystickDevice(const char* path)
int jid, fd, version; int jid, fd, version;
_GLFWjoystickLinux* js; _GLFWjoystickLinux* js;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (!_glfw.linux_js.js[jid].present) if (!_glfw.linux_js.js[jid].present)
continue; continue;
@ -62,7 +62,7 @@ static GLFWbool openJoystickDevice(const char* path)
return GLFW_FALSE; return GLFW_FALSE;
} }
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (!_glfw.linux_js.js[jid].present) if (!_glfw.linux_js.js[jid].present)
break; break;

12
src/win32_joystick.c
View File

@ -339,13 +339,13 @@ static BOOL CALLBACK deviceCallback(const DIDEVICEINSTANCE* di, void* user)
_GLFWobjenumWin32 data; _GLFWobjenumWin32 data;
_GLFWjoystickWin32* js; _GLFWjoystickWin32* js;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (memcmp(&_glfw.win32_js[jid].guid, &di->guidInstance, sizeof(GUID)) == 0) if (memcmp(&_glfw.win32_js[jid].guid, &di->guidInstance, sizeof(GUID)) == 0)
return DIENUM_CONTINUE; return DIENUM_CONTINUE;
} }
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (!_glfw.win32_js[jid].present) if (!_glfw.win32_js[jid].present)
break; break;
@ -451,7 +451,7 @@ static GLFWbool openXinputDevice(DWORD index)
XINPUT_CAPABILITIES xic; XINPUT_CAPABILITIES xic;
_GLFWjoystickWin32* js; _GLFWjoystickWin32* js;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (_glfw.win32_js[jid].present && if (_glfw.win32_js[jid].present &&
_glfw.win32_js[jid].device == NULL && _glfw.win32_js[jid].device == NULL &&
@ -461,7 +461,7 @@ static GLFWbool openXinputDevice(DWORD index)
} }
} }
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
{ {
if (!_glfw.win32_js[jid].present) if (!_glfw.win32_js[jid].present)
break; break;
@ -679,7 +679,7 @@ void _glfwTerminateJoysticksWin32(void)
{ {
int jid; int jid;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
closeJoystick(_glfw.win32_js + jid); closeJoystick(_glfw.win32_js + jid);
if (_glfw.win32.dinput8.api) if (_glfw.win32.dinput8.api)
@ -719,7 +719,7 @@ void _glfwDetectJoystickDisconnectionWin32(void)
{ {
int jid; int jid;
for (jid = GLFW_JOYSTICK_1; jid <= GLFW_JOYSTICK_LAST; jid++) for (jid = 0; jid <= GLFW_JOYSTICK_LAST; jid++)
pollJoystickState(_glfw.win32_js + jid, _GLFW_PRESENCE_ONLY); pollJoystickState(_glfw.win32_js + jid, _GLFW_PRESENCE_ONLY);
} }