Mercurial > sdl-ios-xcode
comparison src/joystick/win32/SDL_dxjoystick.c @ 2717:50bc882455e5
Merge of force feedback branch r4039.
author | Edgar Simo <bobbens@gmail.com> |
---|---|
date | Mon, 25 Aug 2008 17:34:58 +0000 |
parents | 0906692aa6a4 |
children | 02aa80d7905f |
comparison
equal
deleted
inserted
replaced
2716:f8f68f47285a | 2717:50bc882455e5 |
---|---|
83 /* Convert a DirectInput return code to a text message */ | 83 /* Convert a DirectInput return code to a text message */ |
84 static void | 84 static void |
85 SetDIerror(const char *function, HRESULT code) | 85 SetDIerror(const char *function, HRESULT code) |
86 { | 86 { |
87 SDL_SetError("%s() [%s]: %s", function, | 87 SDL_SetError("%s() [%s]: %s", function, |
88 DXGetErrorString(code), DXGetErrorDescription(code)); | 88 DXGetErrorString8A(code), DXGetErrorDescription8A(code)); |
89 } | 89 } |
90 | 90 |
91 | 91 |
92 /* Function to scan the system for joysticks. | 92 /* Function to scan the system for joysticks. |
93 * This function should set SDL_numjoysticks to the number of available | 93 * This function should set SDL_numjoysticks to the number of available |