Skip to content

Y
ygopro-core
Commit fe058086 authored by salix5's avatar salix5
Browse files
Options

Merge pull request #13 from DailyShana/patch-1 

fix
parents 30fac9d7 6b647865
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
field.cpp
View file @ fe058086
...@@ -199,7 +199,7 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence ...@@ -199,7 +199,7 @@ void field::add_card(uint8 playerid, card* pcard, uint8 location, uint8 sequence
case LOCATION_EXTRA: case LOCATION_EXTRA:
player[playerid].list_extra.push_back(pcard); player[playerid].list_extra.push_back(pcard);
pcard->current.sequence = player[playerid].list_extra.size() - 1; pcard->current.sequence = player[playerid].list_extra.size() - 1;
if((pcard->operation_param >> 24) & POS_FACEUP) if((pcard->data.type & TYPE_PENDULUM) && ((pcard->operation_param >> 24) & POS_FACEUP))
++player[playerid].extra_p_count; ++player[playerid].extra_p_count;
break; break;
} }
...@@ -244,7 +244,7 @@ void field::remove_card(card* pcard) { ...@@ -244,7 +244,7 @@ void field::remove_card(card* pcard) {
case LOCATION_EXTRA: case LOCATION_EXTRA:
player[playerid].list_extra.erase(player[playerid].list_extra.begin() + pcard->current.sequence); player[playerid].list_extra.erase(player[playerid].list_extra.begin() + pcard->current.sequence);
reset_sequence(playerid, LOCATION_EXTRA); reset_sequence(playerid, LOCATION_EXTRA);
if(pcard->current.position & POS_FACEUP) if((pcard->data.type & TYPE_PENDULUM) && (pcard->current.position & POS_FACEUP))
--player[playerid].extra_p_count; --player[playerid].extra_p_count;
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