Skip to content

Y
ygopro
Commit 30acee21 authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

draw activate mark for extra deck (#2396)

parent c23402cc
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
gframe/duelclient.cpp
View file @ 30acee21
...@@ -1251,10 +1251,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1251,10 +1251,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dField.conti_act = true; mainGame->dField.conti_act = true;
} else { } else {
pcard->cmdFlag |= COMMAND_ACTIVATE; pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE) if(pcard->controler == 0) {
mainGame->dField.grave_act = true; if(pcard->location == LOCATION_GRAVE)
else if (pcard->location == LOCATION_REMOVED) mainGame->dField.grave_act = true;
mainGame->dField.remove_act = true; else if(pcard->location == LOCATION_REMOVED)
mainGame->dField.remove_act = true;
else if(pcard->location == LOCATION_EXTRA)
mainGame->dField.extra_act = true;
}
} }
} }
mainGame->dField.attackable_cards.clear(); mainGame->dField.attackable_cards.clear();
...@@ -1380,10 +1384,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1380,10 +1384,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame->dField.conti_act = true; mainGame->dField.conti_act = true;
} else { } else {
pcard->cmdFlag |= COMMAND_ACTIVATE; pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE) if(pcard->controler == 0) {
mainGame->dField.grave_act = true; if(pcard->location == LOCATION_GRAVE)
else if (pcard->location == LOCATION_REMOVED) mainGame->dField.grave_act = true;
mainGame->dField.remove_act = true; else if(pcard->location == LOCATION_REMOVED)
mainGame->dField.remove_act = true;
else if(pcard->location == LOCATION_EXTRA)
mainGame->dField.extra_act = true;
}
} }
} }
if(BufferIO::ReadInt8(pbuf)) { if(BufferIO::ReadInt8(pbuf)) {
......
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