Skip to content

Y
ygopro-core
Commit 053414a4 authored by DailyShana's avatar DailyShana
Browse files
Options

fix

parent 9ed81b99
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
card.cpp
View file @ 053414a4
...@@ -2391,13 +2391,12 @@ int32 card::is_can_be_summoned(uint8 playerid, uint8 ignore_count, effect* peffe ...@@ -2391,13 +2391,12 @@ int32 card::is_can_be_summoned(uint8 playerid, uint8 ignore_count, effect* peffe
effect_set proc; effect_set proc;
int32 res = filter_summon_procedure(playerid, &proc, ignore_count, min_tribute); int32 res = filter_summon_procedure(playerid, &proc, ignore_count, min_tribute);
if(peffect) { if(peffect) {
if(res < 0 || !pduel->game_field->is_player_can_summon(peffect->get_value(), playerid, this)){ if(res < 0 || !pduel->game_field->is_player_can_summon(peffect->get_value(), playerid, this)) {
pduel->game_field->restore_lp_cost(); pduel->game_field->restore_lp_cost();
return FALSE; return FALSE;
} }
} } else {
else { if(!proc.size() && (!res || res == -2)) {
if(!proc.size() && res == 0) {
pduel->game_field->restore_lp_cost(); pduel->game_field->restore_lp_cost();
return FALSE; return FALSE;
} }
...@@ -2619,13 +2618,12 @@ int32 card::is_setable_mzone(uint8 playerid, uint8 ignore_count, effect* peffect ...@@ -2619,13 +2618,12 @@ int32 card::is_setable_mzone(uint8 playerid, uint8 ignore_count, effect* peffect
eset.clear(); eset.clear();
int32 res = filter_set_procedure(playerid, &eset, ignore_count, min_tribute); int32 res = filter_set_procedure(playerid, &eset, ignore_count, min_tribute);
if(peffect) { if(peffect) {
if(res < 0 || !pduel->game_field->is_player_can_mset(peffect->get_value(), playerid, this)){ if(res < 0 || !pduel->game_field->is_player_can_mset(peffect->get_value(), playerid, this)) {
pduel->game_field->restore_lp_cost(); pduel->game_field->restore_lp_cost();
return FALSE; return FALSE;
} }
} } else {
else { if(!eset.size() && (!res || res == -2)) {
if(!eset.size() && res == 0) {
pduel->game_field->restore_lp_cost(); pduel->game_field->restore_lp_cost();
return FALSE; return FALSE;
} }
......
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