@@ -2704,8 +2704,6 @@ typedef struct mg_field {
27042704} mg_field;
27052705
27062706
2707- #define BUTTON_FIELDS_START 1
2708- #define AXIS_FIELDS_START 18
27092707
27102708MG_API mg_bool parseMapping(mg_mapping* mapping, const char* string);
27112709mg_bool parseMapping(mg_mapping* mapping, const char* string) {
@@ -2714,7 +2712,7 @@ mg_bool parseMapping(mg_mapping* mapping, const char* string) {
27142712 mg_field fields[] = {
27152713 { "platform", 8, 0, NULL },
27162714
2717- [BUTTON_FIELDS_START] = { "a", 1, MG_BUTTON_SOUTH , NULL},
2715+ { "a", 1, MG_BUTTON_SOUTH , NULL},
27182716 { "b", 1, MG_BUTTON_EAST , NULL},
27192717 { "x", 1, MG_BUTTON_WEST , NULL},
27202718 { "y", 1, MG_BUTTON_NORTH , NULL},
@@ -2732,21 +2730,24 @@ mg_bool parseMapping(mg_mapping* mapping, const char* string) {
27322730 { "lefttrigger", 11, MG_BUTTON_LEFT_TRIGGER , NULL},
27332731 { "righttrigger", 12, MG_BUTTON_RIGHT_TRIGGER , NULL },
27342732
2735- [AXIS_FIELDS_START] = { "lefttrigger", 11, MG_AXIS_LEFT_TRIGGER, NULL},
2733+ { "lefttrigger", 11, MG_AXIS_LEFT_TRIGGER, NULL},
27362734 { "righttrigger", 12, MG_AXIS_RIGHT_TRIGGER, NULL },
27372735 { "leftx", 5, MG_AXIS_LEFT_X, NULL },
27382736 { "lefty", 5, MG_AXIS_LEFT_Y, NULL } ,
27392737 { "rightx", 6, MG_AXIS_RIGHT_X, NULL},
27402738 { "righty", 6, MG_AXIS_RIGHT_Y, NULL }
27412739 };
27422740
2741+ static const mg_size_t button_fields_start = 1;
2742+ static const mg_size_t axis_fields_count = 6;
27432743 len = (sizeof(fields) / sizeof(mg_field));
2744+ mg_size_t axis_start = len - axis_fields_count;
27442745
2745- for (i = BUTTON_FIELDS_START ; i < AXIS_FIELDS_START ; i++) {
2746+ for (i = button_fields_start ; i < axis_start ; i++) {
27462747 fields[i].element = &mapping->buttons[fields[i].val];
27472748 }
27482749
2749- for (i = AXIS_FIELDS_START ; i < len; i++) {
2750+ for (i = axis_start ; i < len; i++) {
27502751 fields[i].element = &mapping->axes[fields[i].val];
27512752 }
27522753
0 commit comments