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

gframe/event_handler.cpp

@@ -1604,7 +1604,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 									myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
 									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);
 									str.append(formatBuffer);
 								}

gframe/replay_mode.cpp

@@ -548,6 +548,8 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 			DuelClient::ClientAnalyze(offset, pbuf - offset);
 			if(cl && !(cl & 0x80) && (pl != cl || pc != cc))
 				ReplayRefreshSingle(cc, cl, cs);
+			else if(pl == cl && cl == LOCATION_DECK)
+				ReplayRefreshDeck(cc);
 			break;
 		}
 		case MSG_POS_CHANGE: {