Commit dfb008f0 authored by Momobako's avatar Momobako

Merge branch 'master' of /root/7210

parents 7e12af5f f9b71c66
...@@ -1096,7 +1096,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1096,7 +1096,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->chain_code = code; pcard->chain_code = code;
mainGame->dField.conti_cards.push_back(pcard); mainGame->dField.conti_cards.push_back(pcard);
mainGame->dField.conti_act = true; mainGame->dField.conti_act = true;
pcard->cmdFlag |= COMMAND_OPERATION;
} else { } else {
pcard->cmdFlag |= COMMAND_ACTIVATE; pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE) if (pcard->location == LOCATION_GRAVE)
...@@ -1226,7 +1225,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -1226,7 +1225,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->chain_code = code; pcard->chain_code = code;
mainGame->dField.conti_cards.push_back(pcard); mainGame->dField.conti_cards.push_back(pcard);
mainGame->dField.conti_act = true; mainGame->dField.conti_act = true;
pcard->cmdFlag |= COMMAND_OPERATION;
} else { } else {
pcard->cmdFlag |= COMMAND_ACTIVATE; pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE) if (pcard->location == LOCATION_GRAVE)
......
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