Skip to content

Y
ygopro-core
Commit 36cab1e4 authored by wind2009's avatar wind2009
Browse files
Options

Make cards in deck releasable

parent 83936a3f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
operations.cpp
View file @ 36cab1e4
...@@ -3773,7 +3773,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u ...@@ -3773,7 +3773,7 @@ int32_t field::destroy(uint16_t step, group * targets, effect * reason_effect, u
return TRUE; return TRUE;
} }
int32_t field::release_replace(uint16_t step, group* targets, card* target) { int32_t field::release_replace(uint16_t step, group* targets, card* target) {
if(!(target->current.location & (LOCATION_ONFIELD | LOCATION_HAND))) { if(!(target->current.location & (LOCATION_ONFIELD | LOCATION_HAND | LOCATION_DECK))) {
target->current.reason = target->temp.reason; target->current.reason = target->temp.reason;
target->current.reason_effect = target->temp.reason_effect; target->current.reason_effect = target->temp.reason_effect;
target->current.reason_player = target->temp.reason_player; target->current.reason_player = target->temp.reason_player;
...@@ -3830,7 +3830,7 @@ int32_t field::release(uint16_t step, group * targets, effect * reason_effect, u ...@@ -3830,7 +3830,7 @@ int32_t field::release(uint16_t step, group * targets, effect * reason_effect, u
if(cv.size() > 1) if(cv.size() > 1)
std::sort(cv.begin(), cv.end(), card::card_operation_sort); std::sort(cv.begin(), cv.end(), card::card_operation_sort);
for (auto& pcard : cv) { for (auto& pcard : cv) {
if(!(pcard->current.location & (LOCATION_ONFIELD | LOCATION_HAND))) { if(!(pcard->current.location & (LOCATION_ONFIELD | LOCATION_HAND | LOCATION_DECK))) {
pcard->current.reason = pcard->temp.reason; pcard->current.reason = pcard->temp.reason;
pcard->current.reason_effect = pcard->temp.reason_effect; pcard->current.reason_effect = pcard->temp.reason_effect;
pcard->current.reason_player = pcard->temp.reason_player; pcard->current.reason_player = pcard->temp.reason_player;
......
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