improve diff display

gframe/client_field.cpp

@@ -1467,8 +1467,17 @@ void ClientField::UpdateDeclarableCode(bool enter) {
 		UpdateDeclarableCodeOpcode(enter);
 }
 void ClientField::RefreshCardCountDisplay() {
+	ClientCard* pcard;
 	for(int p = 0; p < 2; ++p) {
-		mainGame->dInfo.card_count[p] = mzone[p].size() + szone[p].size() + hand[p].size();
+		mainGame->dInfo.card_count[p] = hand[p].size();
+		for(auto it = dField.mzone[p].begin(); it != dField.mzone[p].end(); ++it) {
+			if(*it)
+				mainGame->dInfo.card_count[p]++;
+		}
+		for(auto it = dField.szone[p].begin(); it != dField.szone[p].end(); ++it) {
+			if(*it)
+				mainGame->dInfo.card_count[p]++;
+		}
 		myswprintf(mainGame->dInfo.str_card_count[p], L"%d", mainGame->dInfo.card_count[p]);
 	}
 	if(mainGame->dInfo.card_count[0] > mainGame->dInfo.card_count[1]) {

gframe/drawing.cpp

@@ -547,11 +547,11 @@ void Game::DrawMisc() {
 	DrawShadowText(numFont, dInfo.strLP[0], Resize(330, 12, 631, 30), Resize(0, 1, 2, 0), 0xffffff00, 0xff000000, true, false, 0);
 	DrawShadowText(numFont, dInfo.strLP[1], Resize(691, 12, 992, 30), Resize(0, 1, 2, 0), 0xffffff00, 0xff000000, true, false, 0);
 	
-	DrawShadowText(numFont, dInfo.str_card_adv[0], Resize(455, 52, 490, 71), Resize(0, 1, 2, 0), dInfo.card_adv_color[0], 0xff000000, true, false, 0);
-	DrawShadowText(numFont, dInfo.str_card_count[0], Resize(490, 52, 525, 71), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
+	DrawShadowText(numFont, dInfo.str_card_adv[0], Resize(525, 52, 575, 71), Resize(0, 1, 2, 0), dInfo.card_adv_color[0], 0xff000000, true, false, 0);
+	DrawShadowText(numFont, dInfo.str_card_count[0], Resize(575, 52, 625, 71), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
 
-	DrawShadowText(numFont, dInfo.str_card_count[1], Resize(795, 52, 830, 71), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
-	DrawShadowText(numFont, dInfo.str_card_adv[1], Resize(830, 52, 865, 71), Resize(0, 1, 2, 0), dInfo.card_adv_color[1], 0xff000000, true, false, 0);
+	DrawShadowText(numFont, dInfo.str_card_count[1], Resize(695, 52, 745, 71), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
+	DrawShadowText(numFont, dInfo.str_card_adv[1], Resize(745, 52, 795, 71), Resize(0, 1, 2, 0), dInfo.card_adv_color[1], 0xff000000, true, false, 0);
 
 	recti p1size = Resize(335, 31, 629, 50);
 	recti p2size = Resize(986, 31, 986, 50);