Merge branch 'rr1-maint'

This commit is contained in:
Ilari Liusvaara 2012-02-27 07:41:33 +02:00
commit 0f56afbffd

View file

@ -1216,8 +1216,8 @@ inline short generic_port_read(const unsigned char* buffer, unsigned idx, unsign
} else if(ctrl < analog_axis + buttons) {
size_t bit = 16 * controllers * analog_axis + idx * buttons + ctrl - analog_axis;
return ((buffer[bit / 8] & (1 << (bit % 8))) != 0);
}
} else
return 0;
}
/**