sadpmpk
/
matlab_solitaire
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix selection bug

master
En Yi 2017-10-28 11:38:49 +01:00
parent a34d599962
commit 314fe5b9a7
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sulitear.m
View File

@ -99,33 +99,37 @@ set(win,'Visible','on')
if playing_decks(i).check_Deck_Collision(Xx,Yy,'full') if playing_decks(i).check_Deck_Collision(Xx,Yy,'full')
selected_deck = playing_decks(i); selected_deck = playing_decks(i);
s_index = selected_deck.check_selection(Xx,Yy); %Check which card is selected s_index = selected_deck.check_selection(Xx,Yy); %Check which card is selected
if s_index>=0
% Manually open a hidden card, not used
% if playing_decks(i).check_Deck_Collision(Xx,Yy,'first') && s_index == -1 % Manually open a hidden card, not used
% reset_card_selection(); % if playing_decks(i).check_Deck_Collision(Xx,Yy,'first') && s_index == -1
% selected_deck.reveal_Hidden_Card(1) % reset_card_selection();
% selected_deck.update_Deck_Graphics(disp_axes); % selected_deck.reveal_Hidden_Card(1)
% return % selected_deck.update_Deck_Graphics(disp_axes);
% end % return
% end
% If a deck is previously selected
if (previous_selected_deck ~= 0) % If a deck is previously selected
if previous_selected_deck ~= selected_deck if (previous_selected_deck ~= 0)
[transferring_num,transferring_col]= determine_card(get_bottom_selected(previous_selected_deck)); if previous_selected_deck ~= selected_deck
[destination_num,destination_col] = determine_card(selected_deck.get_Last_Cards()); [transferring_num,transferring_col]= determine_card(get_bottom_selected(previous_selected_deck));
if (transferring_col ~= destination_col &&... % If the colour alternates [destination_num,destination_col] = determine_card(selected_deck.get_Last_Cards());
transferring_num == destination_num-1) % If the number are in sequence if (transferring_col ~= destination_col &&... % If the colour alternates
transfer_Selected_Cards(previous_selected_deck,selected_deck); transferring_num == destination_num-1) % If the number are in sequence
transfer_Selected_Cards(previous_selected_deck,selected_deck);
end
auto_open_hiddencard(); % Reveal a hidden card if there is one
end end
auto_open_hiddencard(); % Reveal a hidden card if there is one
end
reset_card_selection();
else
if ~selected_deck.is_Empty()
reset_card_selection(); reset_card_selection();
selected_deck.selected_start_index = s_index; else
previous_selected_deck = selected_deck; if ~selected_deck.is_Empty()
reset_card_selection();
selected_deck.selected_start_index = s_index;
previous_selected_deck = selected_deck;
end
end end
else
reset_card_selection();
end end
selected_deck.update_Deck_Graphics(disp_axes); selected_deck.update_Deck_Graphics(disp_axes);
return return