Skip to content

Y
ygopro-2pick
Commit 09c94071 authored by nanahira's avatar nanahira
Browse files
Options

update

parent f88ec7d7
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 12 deletions
ocgcore/card.cpp
View file @ 09c94071
...@@ -1354,11 +1354,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1354,11 +1354,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
if(loc1 != loc2) if(loc1 != loc2)
zones |= 1u << s; zones |= 1u << s;
zones |= 1u << (16 + (4 - s)); zones |= 1u << (16 + (4 - s));
if(loc1 & LOCATION_MZONE) {
if(s == 1) if(s == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(s == 3) if(s == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
}
if(s == 5) if(s == 5)
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
if(s == 6) if(s == 6)
...@@ -1368,11 +1370,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1368,11 +1370,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
if(seq >= 0) { if(seq >= 0) {
if(seq <= 4) { if(seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); zones |= 1u << seq | 1u << (16 + (4 - seq));
if(loc1 & LOCATION_MZONE) {
if(seq == 1) if(seq == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(seq == 3) if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
}
if(seq == 5) if(seq == 5)
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
if(seq == 6) if(seq == 6)
...@@ -1384,11 +1388,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1384,11 +1388,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
if(seq <= 6) { if(seq <= 6) {
if(seq <= 4) { if(seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); zones |= 1u << seq | 1u << (16 + (4 - seq));
if(loc1 & LOCATION_MZONE) {
if(seq == 1) if(seq == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(seq == 3) if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
}
if(seq == 5) if(seq == 5)
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
if(seq == 6) if(seq == 6)
......
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