Skip to content

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

another

parent eb60ed28
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 13 deletions
ocgcore/card.cpp
View file @ 152edd1f
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
//222DIY //222DIY
uint32 card::set_entity_code(uint32 entity_code) { uint32 card::set_entity_code(uint32 entity_code) {
card_data dat; card_data dat;
...@@ -1364,10 +1363,12 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1364,10 +1363,12 @@ 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(s == 1) if(loc1 & LOCATION_MZONE) {
zones |= (1u << 5) | (1u << (16 + 6)); if(s == 1)
if(s == 3) zones |= (1u << 5) | (1u << (16 + 6));
zones |= (1u << 6) | (1u << (16 + 5)); if(s == 3)
zones |= (1u << 6) | (1u << (16 + 5));
}
} }
if(s == 5) if(s == 5)
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
...@@ -1378,10 +1379,12 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1378,10 +1379,12 @@ 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(seq == 1) if(loc1 & LOCATION_MZONE) {
zones |= (1u << 5) | (1u << (16 + 6)); if(seq == 1)
if(seq == 3) zones |= (1u << 5) | (1u << (16 + 6));
zones |= (1u << 6) | (1u << (16 + 5)); if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5));
}
} }
if(seq == 5) if(seq == 5)
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
...@@ -1394,10 +1397,12 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) { ...@@ -1394,10 +1397,12 @@ 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(seq == 1) if(loc1 & LOCATION_MZONE) {
zones |= (1u << 5) | (1u << (16 + 6)); if(seq == 1)
if(seq == 3) zones |= (1u << 5) | (1u << (16 + 6));
zones |= (1u << 6) | (1u << (16 + 5)); if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5));
}
} }
if(seq == 5) if(seq == 5)
zones |= (1u << 1) | (1u << (16 + 3)); zones |= (1u << 1) | (1u << (16 + 3));
......
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