adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typenames changed to avoid namespace conflicts (#481)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1276 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-10-16 08:10:54 +00:00
parent cca8df2c74
commit 090123215e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/input/sdl/vcontrol.c
+6 -6
View File
@@ -25,20 +25,20 @@ typedef struct _vcontrol_keypool {
typedef struct _vcontrol_joystick_axis { typedef struct _vcontrol_joystick_axis {
keybinding *neg, *pos; keybinding *neg, *pos;
int polarity; int polarity;
} axis; } axis_type;
typedef struct _vcontrol_joystick_hat { typedef struct _vcontrol_joystick_hat {
keybinding *left, *right, *up, *down; keybinding *left, *right, *up, *down;
Uint8 last; Uint8 last;
} hat; } hat_type;
typedef struct _vcontrol_joystick { typedef struct _vcontrol_joystick {
SDL_Joystick *stick; SDL_Joystick *stick;
int numaxes, numbuttons, numhats; int numaxes, numbuttons, numhats;
int threshold; int threshold;
axis *axes; axis_type *axes;
keybinding **buttons; keybinding **buttons;
hat *hats; hat_type *hats;
} joystick; } joystick;
static keybinding *bindings[SDLK_LAST]; static keybinding *bindings[SDLK_LAST];
@@ -109,9 +109,9 @@ _create_joystick (int index)
x->numaxes = axes; x->numaxes = axes;
x->numbuttons = buttons; x->numbuttons = buttons;
x->numhats = hats; x->numhats = hats;
x->axes = vctrl_malloc (sizeof (axis) * axes); x->axes = vctrl_malloc (sizeof (axis_type) * axes);
x->buttons = vctrl_malloc (sizeof (keybinding *) * buttons); x->buttons = vctrl_malloc (sizeof (keybinding *) * buttons);
x->hats = vctrl_malloc (sizeof (hat) * hats); x->hats = vctrl_malloc (sizeof (hat_type) * hats);
for (j = 0; j < axes; j++) for (j = 0; j < axes; j++)
{ {
x->axes[j].neg = x->axes[j].pos = NULL; x->axes[j].neg = x->axes[j].pos = NULL;