Skip to content

Y
ygopro-2pick
Commit 6e5c1151 authored by salix5's avatar salix5
Browse files
Options

MSG_BECOME_TARGET

parent 9783f9e7
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
gframe/duelclient.cpp
View file @ 6e5c1151
......@@ -916,7 +916,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE)
mainGame->dField.grave_act = true;
if (pcard->location == LOCATION_REMOVED)
else if (pcard->location == LOCATION_REMOVED)
mainGame->dField.remove_act = true;
}
mainGame->dField.attackable_cards.clear();
......@@ -974,13 +974,13 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->SetCode(code);
mainGame->dField.deck_act = true;
}
if (pcard->location == LOCATION_GRAVE)
else if (pcard->location == LOCATION_GRAVE)
mainGame->dField.grave_act = true;
if (pcard->location == LOCATION_REMOVED)
else if (pcard->location == LOCATION_REMOVED)
mainGame->dField.remove_act = true;
if (pcard->location == LOCATION_EXTRA)
else if (pcard->location == LOCATION_EXTRA)
mainGame->dField.extra_act = true;
if (pcard->location == LOCATION_SZONE && pcard->sequence == 6)
else if (pcard->location == LOCATION_SZONE && pcard->sequence == 6)
mainGame->dField.pzone_act[pcard->controler] = true;
}
mainGame->dField.reposable_cards.clear();
......@@ -1031,7 +1031,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if (pcard->location == LOCATION_GRAVE)
mainGame->dField.grave_act = true;
if (pcard->location == LOCATION_REMOVED)
else if (pcard->location == LOCATION_REMOVED)
mainGame->dField.remove_act = true;
}
if(BufferIO::ReadInt8(pbuf)) {
......@@ -1062,8 +1062,10 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
if (pcard->code != code)
pcard->SetCode(code);
BufferIO::ReadInt8(pbuf);
pcard->is_highlighting = true;
mainGame->dField.highlighting_card = pcard;
if(l != LOCATION_DECK) {
pcard->is_highlighting = true;
mainGame->dField.highlighting_card = pcard;
}
myswprintf(textBuffer, dataManager.GetSysString(200), dataManager.FormatLocation(l, s), dataManager.GetName(code));
mainGame->gMutex.Lock();
mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->textFont, textBuffer);
......@@ -1190,11 +1192,11 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
pcard->cmdFlag |= COMMAND_ACTIVATE;
if(l == LOCATION_GRAVE)
mainGame->dField.grave_act = true;
if(l == LOCATION_REMOVED)
else if(l == LOCATION_REMOVED)
mainGame->dField.remove_act = true;
if(l == LOCATION_EXTRA)
else if(l == LOCATION_EXTRA)
mainGame->dField.extra_act = true;
if(l == LOCATION_OVERLAY)
else if(l == LOCATION_OVERLAY)
panelmode = true;
}
}
......@@ -2373,7 +2375,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
}
} else
mainGame->WaitFrameSignal(30);
myswprintf(textBuffer, dataManager.GetSysString(1610), dataManager.GetName(pcard->code), dataManager.FormatLocation(l, s), s);
myswprintf(textBuffer, dataManager.GetSysString(1610), dataManager.GetName(pcard->code), dataManager.FormatLocation(l, s), s + 1);
mainGame->lstLog->addItem(textBuffer);
mainGame->logParam.push_back(pcard->code);
pcard->is_highlighting = false;
......
ocgcore @ 51693962
Subproject commit f7089e78827fea0aebc245639b27f59f76f5f35f
Subproject commit 51693962c2b33886cd376090c9eee1fd7ddba3df
script @ 99d68cc2
Subproject commit 741b50f028be514a8a9ab950836e3cbf74c5875e
Subproject commit 99d68cc26ff3a0ff543941bc4ba1613c66db1748
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