TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove pointer subtraction in kc_change_*

Browse source
This commit is contained in:
Kp 2013-11-02 18:40:00 +00:00
parent 29826db21c
commit 975acb97fe
1 changed files with 25 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
similar/main/kconfig.cpp
View file

@ -431,11 +431,11 @@ kc_item kc_rebirth[] = {
};
static void kc_drawitem( kc_item *item, int is_current );
static void kc_change_key( kc_menu *menu, d_event *event, kc_item * item );
static void kc_change_joybutton( kc_menu *menu, d_event *event, kc_item * item );
static void kc_change_mousebutton( kc_menu *menu, d_event *event, kc_item * item );
static void kc_change_joyaxis( kc_menu *menu, d_event *event, kc_item * item );
static void kc_change_mouseaxis( kc_menu *menu, d_event *event, kc_item * item );
static void kc_change_key( kc_menu *menu, d_event *event, kc_item &item );
static void kc_change_joybutton( kc_menu *menu, d_event *event, kc_item &item );
static void kc_change_mousebutton( kc_menu *menu, d_event *event, kc_item &item );
static void kc_change_joyaxis( kc_menu *menu, d_event *event, kc_item &item );
static void kc_change_mouseaxis( kc_menu *menu, d_event *event, kc_item &item );
static void kc_change_invert( kc_menu *menu, kc_item * item );
static void kc_drawquestion( kc_menu *menu, kc_item *item );
@ -990,7 +990,7 @@ static int kconfig_handler(window *wind, d_event *event, kc_menu *menu)
if (menu->changing && (menu->items[menu->citem].type == BT_MOUSE_BUTTON) && (event->type == EVENT_MOUSE_BUTTON_UP))
#endif
{
kc_change_mousebutton( menu, event, &menu->items[menu->citem] );
kc_change_mousebutton( menu, event, menu->items[menu->citem] );
menu->mouse_state = (event->type == EVENT_MOUSE_BUTTON_DOWN);
return 1;
}
@ -1008,17 +1008,17 @@ static int kconfig_handler(window *wind, d_event *event, kc_menu *menu)
return kconfig_mouse(wind, event, menu);
case EVENT_MOUSE_MOVED:
if (menu->changing && menu->items[menu->citem].type == BT_MOUSE_AXIS) kc_change_mouseaxis(menu, event, &menu->items[menu->citem]);
if (menu->changing && menu->items[menu->citem].type == BT_MOUSE_AXIS) kc_change_mouseaxis(menu, event, menu->items[menu->citem]);
else
event_mouse_get_delta( event, &menu->old_maxis[0], &menu->old_maxis[1], &menu->old_maxis[2]);
break;
case EVENT_JOYSTICK_BUTTON_DOWN:
if (menu->changing && menu->items[menu->citem].type == BT_JOY_BUTTON) kc_change_joybutton(menu, event, &menu->items[menu->citem]);
if (menu->changing && menu->items[menu->citem].type == BT_JOY_BUTTON) kc_change_joybutton(menu, event, menu->items[menu->citem]);
break;
case EVENT_JOYSTICK_MOVED:
if (menu->changing && menu->items[menu->citem].type == BT_JOY_AXIS) kc_change_joyaxis(menu, event, &menu->items[menu->citem]);
if (menu->changing && menu->items[menu->citem].type == BT_JOY_AXIS) kc_change_joyaxis(menu, event, menu->items[menu->citem]);
else
{
int axis, value;
@ -1032,7 +1032,7 @@ static int kconfig_handler(window *wind, d_event *event, kc_menu *menu)
int rval = kconfig_key_command(wind, event, menu);
if (rval)
return rval;
if (menu->changing && menu->items[menu->citem].type == BT_KEY) kc_change_key(menu, event, &menu->items[menu->citem]);
if (menu->changing && menu->items[menu->citem].type == BT_KEY) kc_change_key(menu, event, menu->items[menu->citem]);
return 0;
}
@ -1161,7 +1161,7 @@ static void kc_drawquestion( kc_menu *menu, kc_item *item )
gr_string( x, FSPACY(item->y), "?" );
}
static void kc_change_key( kc_menu *menu, d_event *event, kc_item * item )
static void kc_change_key( kc_menu *menu, d_event *event, kc_item &item )
{
ubyte keycode = 255;
@ -1177,18 +1177,16 @@ static void kc_change_key( kc_menu *menu, d_event *event, kc_item * item )
for (unsigned i=0; i<menu->nitems; i++ )
{
unsigned n;
n = item - menu->items;
if ( (i!=n) && (menu->items[i].type==BT_KEY) && (menu->items[i].value==keycode) )
if ( (&menu->items[i] != &item) && (menu->items[i].type==BT_KEY) && (menu->items[i].value==keycode) )
{
menu->items[i].value = 255;
}
}
item->value = keycode;
item.value = keycode;
menu->changing = 0;
}
static void kc_change_joybutton( kc_menu *menu, d_event *event, kc_item * item )
static void kc_change_joybutton( kc_menu *menu, d_event *event, kc_item &item )
{
int button = 255;
@ -1197,16 +1195,14 @@ static void kc_change_joybutton( kc_menu *menu, d_event *event, kc_item * item )
for (unsigned i=0; i<menu->nitems; i++ )
{
unsigned n;
n = item - menu->items;
if ( (i!=n) && (menu->items[i].type==BT_JOY_BUTTON) && (menu->items[i].value==button) )
if ( (&menu->items[i] != &item) && (menu->items[i].type==BT_JOY_BUTTON) && (menu->items[i].value==button) )
menu->items[i].value = 255;
}
item->value = button;
item.value = button;
menu->changing = 0;
}
static void kc_change_mousebutton( kc_menu *menu, d_event *event, kc_item * item )
static void kc_change_mousebutton( kc_menu *menu, d_event *event, kc_item &item )
{
int button;
@ -1215,16 +1211,14 @@ static void kc_change_mousebutton( kc_menu *menu, d_event *event, kc_item * item
for (unsigned i=0; i<menu->nitems; i++)
{
unsigned n;
n = item - menu->items;
if ( (i!=n) && (menu->items[i].type==BT_MOUSE_BUTTON) && (menu->items[i].value==button) )
if ( (&menu->items[i] != &item) && (menu->items[i].type==BT_MOUSE_BUTTON) && (menu->items[i].value==button) )
menu->items[i].value = 255;
}
item->value = button;
item.value = button;
menu->changing = 0;
}
static void kc_change_joyaxis( kc_menu *menu, d_event *event, kc_item * item )
static void kc_change_joyaxis( kc_menu *menu, d_event *event, kc_item &item )
{
int axis, value;
@ -1237,16 +1231,14 @@ static void kc_change_joyaxis( kc_menu *menu, d_event *event, kc_item * item )
for (unsigned i=0; i<menu->nitems; i++ )
{
unsigned n;
n = item - menu->items;
if ( (i!=n) && (menu->items[i].type==BT_JOY_AXIS) && (menu->items[i].value==axis) )
if ( (&menu->items[i] != &item) && (menu->items[i].type==BT_JOY_AXIS) && (menu->items[i].value==axis) )
menu->items[i].value = 255;
}
item->value = axis;
item.value = axis;
menu->changing = 0;
}
static void kc_change_mouseaxis( kc_menu *menu, d_event *event, kc_item * item )
static void kc_change_mouseaxis( kc_menu *menu, d_event *event, kc_item &item )
{
int dx, dy, dz;
ubyte code = 255;
@ -1261,12 +1253,10 @@ static void kc_change_mouseaxis( kc_menu *menu, d_event *event, kc_item * item )
{
for (unsigned i=0; i<menu->nitems; i++ )
{
unsigned n;
n = item - menu->items;
if ( (i!=n) && (menu->items[i].type==BT_MOUSE_AXIS) && (menu->items[i].value==code) )
if ( (&menu->items[i] != &item) && (menu->items[i].type==BT_MOUSE_AXIS) && (menu->items[i].value==code) )
menu->items[i].value = 255;
}
item->value = code;
item.value = code;
menu->changing = 0;
}
}