Merge pull request #164 from ricfehr3/hotfix/hand-input-order
Fix softlock related to #163
This commit is contained in:
+2
-4
@@ -1312,8 +1312,7 @@ static void game_playing_process_hand_select_input()
|
|||||||
discard_button_highlighted = true; // Discard button
|
discard_button_highlighted = true; // Discard button
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (selection_y == 1) // On row of play/discard buttons
|
||||||
if (selection_y == 1) // On row of play/discard buttons
|
|
||||||
{
|
{
|
||||||
if (discard_button_highlighted == false) // Play button logic
|
if (discard_button_highlighted == false) // Play button logic
|
||||||
{
|
{
|
||||||
@@ -1345,8 +1344,7 @@ static void game_playing_process_hand_select_input()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (selection_y == 0) // On row of cards
|
||||||
if (selection_y == 0) // On row of cards
|
|
||||||
{
|
{
|
||||||
memcpy16(&pal_bg_mem[PLAY_HAND_BTN_SELECTED_BORDER_PID], &pal_bg_mem[PLAY_HAND_BTN_PID], 1); // Play button highlight color
|
memcpy16(&pal_bg_mem[PLAY_HAND_BTN_SELECTED_BORDER_PID], &pal_bg_mem[PLAY_HAND_BTN_PID], 1); // Play button highlight color
|
||||||
memcpy16(&pal_bg_mem[DISCARD_BTN_SELECTED_BORDER_PID], &pal_bg_mem[DISCARD_BTN_PID], 1); // Discard button highlight color
|
memcpy16(&pal_bg_mem[DISCARD_BTN_SELECTED_BORDER_PID], &pal_bg_mem[DISCARD_BTN_PID], 1); // Discard button highlight color
|
||||||
|
|||||||
Reference in New Issue
Block a user