Skip to content

Y
ygopro-core
Commit b20174d9 authored by Aephiex's avatar Aephiex Committed by DailyShana
Browse files
Options

Update EFFECT_MUST_USE_MZONE (#158)

parent 9c5c4a53
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
field.cpp
View file @ b20174d9
...@@ -690,12 +690,11 @@ int32 field::get_spsummonable_count_fromex_rule4(card* pcard, uint8 playerid, ui ...@@ -690,12 +690,11 @@ int32 field::get_spsummonable_count_fromex_rule4(card* pcard, uint8 playerid, ui
value = eset[i]->get_value(pcard, 3); value = eset[i]->get_value(pcard, 3);
} }
if(eset[i]->get_handler_player() == playerid) if(eset[i]->get_handler_player() == playerid)
flag |= ~value & 0x1f; flag |= ~value & 0x7f;
else else
flag |= ~(value >> 16) & 0x1f; flag |= ~(value >> 16) & 0x7f;
} }
uint32 linked_zone = get_linked_zone(playerid) | (1u << 5) | (1u << 6); uint32 linked_zone = get_linked_zone(playerid) | (1u << 5) | (1u << 6);
flag = flag | ~zone | ~linked_zone;
if(player[playerid].list_mzone[5] && is_location_useable(playerid, LOCATION_MZONE, 6) if(player[playerid].list_mzone[5] && is_location_useable(playerid, LOCATION_MZONE, 6)
&& check_extra_link(playerid, pcard, 6)) { && check_extra_link(playerid, pcard, 6)) {
flag |= 1u << 5; flag |= 1u << 5;
...@@ -710,6 +709,7 @@ int32 field::get_spsummonable_count_fromex_rule4(card* pcard, uint8 playerid, ui ...@@ -710,6 +709,7 @@ int32 field::get_spsummonable_count_fromex_rule4(card* pcard, uint8 playerid, ui
if(!is_location_useable(playerid, LOCATION_MZONE, 6)) if(!is_location_useable(playerid, LOCATION_MZONE, 6))
flag |= 1u << 6; flag |= 1u << 6;
} }
flag = flag | ~zone | ~linked_zone;
if(list) if(list)
*list = flag & 0x7f; *list = flag & 0x7f;
int32 count = 5 - field_used_count[flag & 0x1f]; int32 count = 5 - field_used_count[flag & 0x1f];
......
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