Commit 6dc48e12 authored by Chrono-Genex's avatar Chrono-Genex Committed by GitHub

add STATUS_TO_HAND_WITHOUT_CONFIRM (#420)

parent 2fdba300
...@@ -187,7 +187,7 @@ struct card_sort { ...@@ -187,7 +187,7 @@ struct card_sort {
#define STATUS_FUTURE_FUSION 0x100000 #define STATUS_FUTURE_FUSION 0x100000
#define STATUS_ATTACK_CANCELED 0x200000 #define STATUS_ATTACK_CANCELED 0x200000
#define STATUS_INITIALIZING 0x400000 #define STATUS_INITIALIZING 0x400000
//#define STATUS_ACTIVATED 0x800000 #define STATUS_TO_HAND_WITHOUT_CONFIRM 0x800000
#define STATUS_JUST_POS 0x1000000 #define STATUS_JUST_POS 0x1000000
#define STATUS_CONTINUOUS_POS 0x2000000 #define STATUS_CONTINUOUS_POS 0x2000000
#define STATUS_FORBIDDEN 0x4000000 #define STATUS_FORBIDDEN 0x4000000
......
...@@ -221,6 +221,7 @@ void field::remove_card(card* pcard) { ...@@ -221,6 +221,7 @@ void field::remove_card(card* pcard) {
core.shuffle_deck_check[playerid] = TRUE; core.shuffle_deck_check[playerid] = TRUE;
break; break;
case LOCATION_HAND: case LOCATION_HAND:
pcard->set_status(STATUS_TO_HAND_WITHOUT_CONFIRM, FALSE);
player[playerid].list_hand.erase(player[playerid].list_hand.begin() + pcard->current.sequence); player[playerid].list_hand.erase(player[playerid].list_hand.begin() + pcard->current.sequence);
reset_sequence(playerid, LOCATION_HAND); reset_sequence(playerid, LOCATION_HAND);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment