Commit 2ef064f9 authored by VanillaSalt's avatar VanillaSalt

fix

parent bd4c96c6
...@@ -173,18 +173,16 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence ...@@ -173,18 +173,16 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence
if (sequence == 0) { //deck top if (sequence == 0) { //deck top
player[playerid].list_main.push_back(pcard); player[playerid].list_main.push_back(pcard);
pcard->current.sequence = player[playerid].list_main.size() - 1; pcard->current.sequence = player[playerid].list_main.size() - 1;
pcard->current.position = POS_FACEUP_ATTACK;
} else if (sequence == 1) { //deck button } else if (sequence == 1) { //deck button
player[playerid].list_main.insert(player[playerid].list_main.begin(), pcard); player[playerid].list_main.insert(player[playerid].list_main.begin(), pcard);
reset_sequence(playerid, LOCATION_DECK); reset_sequence(playerid, LOCATION_DECK);
pcard->current.position = POS_FACEDOWN;
} else { //deck top & shuffle } else { //deck top & shuffle
player[playerid].list_main.push_back(pcard); player[playerid].list_main.push_back(pcard);
pcard->current.sequence = player[playerid].list_main.size() - 1; pcard->current.sequence = player[playerid].list_main.size() - 1;
if(!core.shuffle_check_disabled) if(!core.shuffle_check_disabled)
core.shuffle_deck_check[playerid] = TRUE; core.shuffle_deck_check[playerid] = TRUE;
pcard->current.position = POS_FACEDOWN;
} }
pcard->operation_param = (pcard->operation_param & 0x00ffffff) | (POS_FACEDOWN << 24);
break; break;
} }
case LOCATION_HAND: { case LOCATION_HAND: {
......
...@@ -336,7 +336,7 @@ int32 field::draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reaso ...@@ -336,7 +336,7 @@ int32 field::draw(uint16 step, effect* reason_effect, uint32 reason, uint8 reaso
add_card(playerid, pcard, LOCATION_HAND, 0); add_card(playerid, pcard, LOCATION_HAND, 0);
pcard->enable_field_effect(TRUE); pcard->enable_field_effect(TRUE);
effect* pub = pcard->is_affected_by_effect(EFFECT_PUBLIC); effect* pub = pcard->is_affected_by_effect(EFFECT_PUBLIC);
if(pub || pcard->current.position == POS_FACEUP_ATTACK) if(pub)
public_count++; public_count++;
pcard->current.position = pub ? POS_FACEUP : POS_FACEDOWN; pcard->current.position = pub ? POS_FACEUP : POS_FACEDOWN;
cv.push_back(pcard); cv.push_back(pcard);
......
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