Skip to content

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

update

parent 4acc89c4
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 28 deletions
ocgcore/card.cpp
View file @ f5f6e663
...@@ -1365,10 +1365,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1365,10 +1365,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
if(s == 6) if(s == 6)
zones |= (1u << 3) | (1u << (16 + 1)); zones |= (1u << 3) | (1u << (16 + 1));
for (int32 i = 1; i <= left; ++i) { for(int32 i = 1; i <= left; ++i) {
int32 seq = s - i; int32 seq = s - i;
if(seq >= 0) { if(s == 5)
if(seq <= 4) { seq = 1 - i;
if(s == 6)
seq = 3 - i;
if(seq >= 0 && seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); zones |= 1u << seq | 1u << (16 + (4 - seq));
if(loc1 & LOCATION_MZONE) { if(loc1 & LOCATION_MZONE) {
if(seq == 1) if(seq == 1)
...@@ -1377,16 +1380,14 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1377,16 +1380,14 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
} }
if(seq == 5)
zones |= (1u << 1) | (1u << (16 + 3));
if(seq == 6)
zones |= (1u << 3) | (1u << (16 + 1));
}
} }
for (int32 i = 1; i <= right; ++i) { for(int32 i = 1; i <= right; ++i) {
int32 seq = s + i; int32 seq = s + i;
if(seq <= 6) { if(s == 5)
if(seq <= 4) { seq = 1 + i;
if(s == 6)
seq = 3 + i;
if(seq >= 0 && seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); zones |= 1u << seq | 1u << (16 + (4 - seq));
if(loc1 & LOCATION_MZONE) { if(loc1 & LOCATION_MZONE) {
if(seq == 1) if(seq == 1)
...@@ -1395,11 +1396,6 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1395,11 +1396,6 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
} }
if(seq == 5)
zones |= (1u << 1) | (1u << (16 + 3));
if(seq == 6)
zones |= (1u << 3) | (1u << (16 + 1));
}
} }
return zones; return zones;
} }
......
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