Skip to content

Y
ygopro-core
Commit 9a643368 authored by DailyShana's avatar DailyShana
Browse files
Options

update move to field

parent 83d1ccf9
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
field.cpp
View file @ 9a643368
......@@ -310,7 +310,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc
if (playerid == preplayer && sequence == presequence)
return;
if((location == LOCATION_MZONE && (sequence < 0 || sequence > 4 || player[playerid].list_mzone[sequence]))
|| (location == LOCATION_SZONE && (sequence < 0 || sequence > 4 || player[playerid].list_szone[sequence])))
|| (location == LOCATION_SZONE && (sequence < 0 || sequence > 7 || player[playerid].list_szone[sequence])))
return;
if(preplayer == playerid) {
pduel->write_buffer8(MSG_MOVE);
......
operations.cpp
View file @ 9a643368
......@@ -3794,12 +3794,14 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
}
} else if(!is_equip && location == LOCATION_SZONE && (target->data.type & TYPE_PENDULUM)) {
uint32 flag = 0;
if(!get_field_card(playerid, LOCATION_SZONE, 6))
if(is_location_useable(playerid, LOCATION_SZONE, 6))
flag |= 1 << 14;
if(!get_field_card(playerid, LOCATION_SZONE, 7))
if(is_location_useable(playerid, LOCATION_SZONE, 7))
flag |= 1 << 15;
if(move_player != playerid)
flag = flag << 16;
pduel->write_buffer8(MSG_SELECT_PLACE);
pduel->write_buffer8(playerid);
pduel->write_buffer8(move_player);
pduel->write_buffer8(1);
pduel->write_buffer32(~flag);
} else {
......
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