Taiko_Stuff/TaikoArcadeLoader
1
1
Fork 0
mirror of synced 2025-02-17 18:49:23 +01:00
Code Actions Releases Activity

fix MultiQrCode

Browse Source
This commit is contained in:
RyuMiya 2023-12-25 15:44:45 +08:00
parent b510c1e535
commit 732ecb555f
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bnusio.cpp
View File

@ -39,7 +39,7 @@ Keybindings P2_LEFT_BLUE = {};
Keybindings P2_LEFT_RED = {};
Keybindings P2_RIGHT_RED = {};
Keybindings P2_RIGHT_BLUE = {};
CardKeybindings *QRCODE_CARDS = {};
CardKeybindings *QRCODE_CARDS = new CardKeybindings[0];
size_t QRCODE_CARDS_LENG = 0;
namespace bnusio {
@ -344,7 +344,7 @@ Init () {
SetConfigValue (keyconfig, "P2_RIGHT_RED", &P2_RIGHT_RED);
SetConfigValue (keyconfig, "P2_RIGHT_BLUE", &P2_RIGHT_BLUE);
SetCardConfigValue (keyconfig, "QRCODE_CARD", &QRCODE_CARDS, &QRCODE_CARDS_LENG);
SetCardConfigValue (keyconfig, "QRCODE_CARD", QRCODE_CARDS, &QRCODE_CARDS_LENG);
toml_free (keyconfig);
}

36
src/poll.cpp
View File

@ -185,7 +185,7 @@ SetConfigValue (toml_table_t *table, const char *key, Keybindings *keybind) {
}
void
SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings **cards, size_t *leng) {
SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings *cards, size_t *leng) {
toml_array_t *top_array = toml_array_in (table, key);
if (!top_array) {
printWarning ("%s (%s): Cannot find array\n", __func__, key);
@ -194,13 +194,13 @@ SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings **card
size_t length = toml_array_nelem(top_array);
*leng = length;
memset(cards, 0, length * (sizeof (*cards)));
cards = new CardKeybindings[length];
for (size_t i = 0; i < length; ++i) {
toml_table_t* card_obj = toml_table_at(top_array, i);
if (card_obj) {
memset (cards[i], 0, sizeof (**cards));
cards[i]->card = readConfigString(card_obj, "CARD", "");
CardKeybindings cardInfo = cards[i] = {};
cardInfo.card = readConfigString(card_obj, "CARD", "");
toml_array_t *array = toml_array_in (card_obj, "READ_KEY");
if (!array) {
@ -208,8 +208,8 @@ SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings **card
return;
}
for (size_t i = 0; i < COUNTOFARR (cards[i]->keybindings.buttons); i++)
cards[i]->keybindings.buttons[i] = SDL_CONTROLLER_BUTTON_INVALID;
for (size_t i = 0; i < COUNTOFARR (cardInfo.keybindings.buttons); i++)
cardInfo.keybindings.buttons[i] = SDL_CONTROLLER_BUTTON_INVALID;
for (size_t i = 0;; i++) {
toml_datum_t bind = toml_string_at (array, i);
@ -219,32 +219,32 @@ SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings **card
switch (value.type) {
case keycode:
for (size_t i = 0; i < COUNTOFARR (cards[i]->keybindings.keycodes); i++) {
if (cards[i]->keybindings.keycodes[i] == 0) {
cards[i]->keybindings.keycodes[i] = value.keycode;
for (size_t i = 0; i < COUNTOFARR (cardInfo.keybindings.keycodes); i++) {
if (cardInfo.keybindings.keycodes[i] == 0) {
cardInfo.keybindings.keycodes[i] = value.keycode;
break;
}
}
break;
case button:
for (size_t i = 0; i < COUNTOFARR (cards[i]->keybindings.buttons); i++) {
if (cards[i]->keybindings.buttons[i] == SDL_CONTROLLER_BUTTON_INVALID) {
cards[i]->keybindings.buttons[i] = value.button;
for (size_t i = 0; i < COUNTOFARR (cardInfo.keybindings.buttons); i++) {
if (cardInfo.keybindings.buttons[i] == SDL_CONTROLLER_BUTTON_INVALID) {
cardInfo.keybindings.buttons[i] = value.button;
break;
}
}
break;
case axis:
for (size_t i = 0; i < COUNTOFARR (cards[i]->keybindings.axis); i++) {
if (cards[i]->keybindings.axis[i] == 0) {
cards[i]->keybindings.axis[i] = value.axis;
for (size_t i = 0; i < COUNTOFARR (cardInfo.keybindings.axis); i++) {
if (cardInfo.keybindings.axis[i] == 0) {
cardInfo.keybindings.axis[i] = value.axis;
break;
}
}
case scroll:
for (size_t i = 0; i < COUNTOFARR (cards[i]->keybindings.scroll); i++) {
if (cards[i]->keybindings.scroll[i] == 0) {
cards[i]->keybindings.scroll[i] = value.scroll;
for (size_t i = 0; i < COUNTOFARR (cardInfo.keybindings.scroll); i++) {
if (cardInfo.keybindings.scroll[i] == 0) {
cardInfo.keybindings.scroll[i] = value.scroll;
break;
}
}

2
src/poll.h
View File

@ -71,7 +71,7 @@ void UpdatePoll (HWND windowHandle);
void DisposePoll ();
ConfigValue StringToConfigEnum (const char *value);
void SetConfigValue (toml_table_t *table, const char *key, Keybindings *keybind);
void SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings **keybind, size_t *leng);
void SetCardConfigValue (toml_table_t *table, const char *key, CardKeybindings *keybind, size_t *leng);
InternalButtonState GetInternalButtonState (Keybindings bindings);
void SetRumble (int left, int right, int length);