Commit da904359 authored by VanillaSalt's avatar VanillaSalt

fix

parent 97b1e996
......@@ -31,7 +31,6 @@ ClientField::ClientField() {
mzone[p].resize(7, 0);
szone[p].resize(8, 0);
}
usable_exmzone = 0;
}
void ClientField::Clear() {
for(int i = 0; i < 2; ++i) {
......@@ -66,7 +65,6 @@ void ClientField::Clear() {
overlay_cards.clear();
extra_p_count[0] = 0;
extra_p_count[1] = 0;
usable_exmzone = 0;
chains.clear();
activatable_cards.clear();
summonable_cards.clear();
......@@ -183,8 +181,6 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
}
case LOCATION_MZONE: {
mzone[controler][sequence] = pcard;
if (!usable_exmzone && sequence >= 5)
usable_exmzone = sequence;
break;
}
case LOCATION_SZONE: {
......
......@@ -41,8 +41,7 @@ public:
std::vector<int> select_options;
std::vector<ChainInfo> chains;
int extra_p_count[2];
int usable_exmzone;
size_t selected_option;
ClientCard* attacker;
ClientCard* attack_target;
......
......@@ -2130,7 +2130,7 @@ void ClientField::GetHoverField(int x, int y) {
hovered_sequence = sequence;
} else if(boardy >= matManager.vFieldMzone[0][5][0].Pos.Y && boardy <= matManager.vFieldMzone[0][5][2].Pos.Y) {
if(sequence == 1) {
if(usable_exmzone != 6) {
if(!mzone[1][6]) {
hovered_controler = 0;
hovered_location = LOCATION_MZONE;
hovered_sequence = 5;
......@@ -2140,7 +2140,7 @@ void ClientField::GetHoverField(int x, int y) {
hovered_sequence = 6;
}
} else if(sequence == 3) {
if(usable_exmzone != 5) {
if(!mzone[1][5]) {
hovered_controler = 0;
hovered_location = LOCATION_MZONE;
hovered_sequence = 6;
......
......@@ -281,7 +281,7 @@
!system 1260 大师规则
!system 1261 大师规则2
!system 1262 大师规则3
!system 1263 大师规则4
!system 1263 新大师规则
!system 1270 卡片信息
!system 1271 消息记录
!system 1272 清除记录
......
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