Skip to content

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

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

parents 43459c83 d26deec3
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
gframe/event_handler.cpp
View file @ c6e1a286
...@@ -1604,7 +1604,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1604,7 +1604,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias)); myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
str.append(formatBuffer); str.append(formatBuffer);
} }
if(mcard->location == LOCATION_SZONE && mcard->lscale) { if(mcard->location == LOCATION_SZONE && (mcard->type & TYPE_PENDULUM)) {
myswprintf(formatBuffer, L"\n%d/%d", mcard->lscale, mcard->rscale); myswprintf(formatBuffer, L"\n%d/%d", mcard->lscale, mcard->rscale);
str.append(formatBuffer); str.append(formatBuffer);
} }
......
gframe/replay_mode.cpp
View file @ c6e1a286
...@@ -548,6 +548,8 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) { ...@@ -548,6 +548,8 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
DuelClient::ClientAnalyze(offset, pbuf - offset); DuelClient::ClientAnalyze(offset, pbuf - offset);
if(cl && !(cl & 0x80) && (pl != cl || pc != cc)) if(cl && !(cl & 0x80) && (pl != cl || pc != cc))
ReplayRefreshSingle(cc, cl, cs); ReplayRefreshSingle(cc, cl, cs);
else if(pl == cl && cl == LOCATION_DECK)
ReplayRefreshDeck(cc);
break; break;
} }
case MSG_POS_CHANGE: { case MSG_POS_CHANGE: {
......
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