Skip to content

Y
ygopro
Commit 4c9ed996 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'master' of https://github.com/Fluorohydride/ygopro

parents 0b0cc4f9 312d490f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
gframe/client_card.cpp
View file @ 4c9ed996
...@@ -165,13 +165,11 @@ void ClientCard::UpdateInfo(char* buf) { ...@@ -165,13 +165,11 @@ void ClientCard::UpdateInfo(char* buf) {
} }
void ClientCard::ClearTarget() { void ClientCard::ClearTarget() {
for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) { for(auto cit = cardTarget.begin(); cit != cardTarget.end(); ++cit) {
if(is_showtarget) (*cit)->is_showtarget = false;
(*cit)->is_showtarget = false;
(*cit)->ownerTarget.erase(this); (*cit)->ownerTarget.erase(this);
} }
for(auto cit = ownerTarget.begin(); cit != ownerTarget.end(); ++cit) { for(auto cit = ownerTarget.begin(); cit != ownerTarget.end(); ++cit) {
if(is_showtarget) (*cit)->is_showtarget = false;
(*cit)->is_showtarget = false;
(*cit)->cardTarget.erase(this); (*cit)->cardTarget.erase(this);
} }
cardTarget.clear(); cardTarget.clear();
......
gframe/duelclient.cpp
View file @ 4c9ed996
...@@ -2573,6 +2573,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) { ...@@ -2573,6 +2573,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
} else { } else {
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
if(pc1->equipTarget) { if(pc1->equipTarget) {
pc1->is_showequip = false;
pc1->equipTarget->is_showequip = false; pc1->equipTarget->is_showequip = false;
pc1->equipTarget->equipped.erase(pc1); pc1->equipTarget->equipped.erase(pc1);
} }
......
ocgcore @ 7861b594
Subproject commit 82cc183073b4bb46a62e5b27dbb86d5b798d15fd Subproject commit 7861b594b004e93bc2af1689e4dcc7e7f1792fdf
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