Merge branch 'diff' into another

gframe/client_field.cpp

@@ -94,6 +94,7 @@ void ClientField::Clear() {
 	pzone_act[1] = false;
 	conti_act = false;
 	deck_reversed = false;
+	RefreshCardCountDisplay();
 }
 void ClientField::Initial(int player, int deckc, int extrac) {
 	ClientCard* pcard;
@@ -117,6 +118,7 @@ void ClientField::Initial(int player, int deckc, int extrac) {
 		pcard->position = POS_FACEDOWN_DEFENSE;
 		GetCardLocation(pcard, &pcard->curPos, &pcard->curRot, true);
 	}
+	RefreshCardCountDisplay();
 }
 ClientCard* ClientField::GetCard(int controler, int location, int sequence, int sub_seq) {
 	std::vector<ClientCard*>* lst = 0;
@@ -226,6 +228,7 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 		break;
 	}
 	}
+	RefreshCardCountDisplay();
 }
 ClientCard* ClientField::RemoveCard(int controler, int location, int sequence) {
 	ClientCard* pcard = 0;
@@ -297,6 +300,7 @@ ClientCard* ClientField::RemoveCard(int controler, int location, int sequence) {
 	}
 	}
 	pcard->location = 0;
+	RefreshCardCountDisplay();
 	return pcard;
 }
 void ClientField::UpdateCard(int controler, int location, int sequence, char* data) {
@@ -1462,4 +1466,37 @@ void ClientField::UpdateDeclarableCode(bool enter) {
 	else
 		UpdateDeclarableCodeOpcode(enter);
 }
+void ClientField::RefreshCardCountDisplay() {
+	for(int p = 0; p < 2; ++p) {
+		mainGame->dInfo.card_count[p] = hand[p].size();
+		for(auto it = mzone[p].begin(); it != mzone[p].end(); ++it) {
+			if(*it)
+				mainGame->dInfo.card_count[p]++;
+		}
+		for(auto it = szone[p].begin(); it != 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]) {
+		mainGame->dInfo.card_adv_color[0] = 0xffffff00;
+		mainGame->dInfo.card_adv_color[1] = 0xffff0000;
+		mainGame->dInfo.card_adv = mainGame->dInfo.card_count[0] - mainGame->dInfo.card_count[1];
+		myswprintf(mainGame->dInfo.str_card_adv[0], L"+%d", mainGame->dInfo.card_adv);
+		myswprintf(mainGame->dInfo.str_card_adv[1], L"-%d", mainGame->dInfo.card_adv);
+	} else if(mainGame->dInfo.card_count[1] > mainGame->dInfo.card_count[0]) {
+		mainGame->dInfo.card_adv_color[1] = 0xffffff00;
+		mainGame->dInfo.card_adv_color[0] = 0xffff0000;
+		mainGame->dInfo.card_adv = mainGame->dInfo.card_count[1] - mainGame->dInfo.card_count[0];
+		myswprintf(mainGame->dInfo.str_card_adv[1], L"+%d", mainGame->dInfo.card_adv);
+		myswprintf(mainGame->dInfo.str_card_adv[0], L"-%d", mainGame->dInfo.card_adv);
+	} else {
+		mainGame->dInfo.card_adv_color[0] = 0xffffffff;
+		mainGame->dInfo.card_adv_color[1] = 0xffffffff;
+		mainGame->dInfo.card_adv = 0;
+		myswprintf(mainGame->dInfo.str_card_adv[0], L"+%d", mainGame->dInfo.card_adv);
+		myswprintf(mainGame->dInfo.str_card_adv[1], L"+%d", mainGame->dInfo.card_adv);
+	}
+}
 }

gframe/client_field.h

@@ -115,6 +115,8 @@ public:
 	void UpdateDeclarableCodeOpcode(bool enter);
 	void UpdateDeclarableCode(bool enter);
 
+	void RefreshCardCountDisplay();
+
 	irr::gui::IGUIElement* panel;
 	std::vector<int> ancard;
 	int hovered_controler;

gframe/drawing.cpp

@@ -543,6 +543,19 @@ void Game::DrawMisc() {
 		driver->draw2DRectangleOutline(Resize(525, 34, 625, 44), 0xffffffff);
 		driver->draw2DRectangle(Resize(795 - dInfo.time_left[1] * 100 / dInfo.time_limit, 34, 795, 44), 0xa0e0e0e0, 0xa0e0e0e0, 0xa0c0c0c0, 0xa0c0c0c0);
 		driver->draw2DRectangleOutline(Resize(695, 34, 795, 44), 0xffffffff);
+		
+		DrawShadowText(numFont, dInfo.str_card_adv[0], Resize(395, 31, 425, 50), Resize(0, 1, 2, 0), dInfo.card_adv_color[0], 0xff000000, true, false, 0);
+		DrawShadowText(numFont, dInfo.str_card_count[0], Resize(425, 31, 455, 50), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
+
+		DrawShadowText(numFont, dInfo.str_card_count[1], Resize(865, 31, 895, 50), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
+		DrawShadowText(numFont, dInfo.str_card_adv[1], Resize(895, 31, 925, 50), Resize(0, 1, 2, 0), dInfo.card_adv_color[1], 0xff000000, true, false, 0);
+	}
+	else {
+		DrawShadowText(numFont, dInfo.str_card_adv[0], Resize(565, 31, 595, 50), Resize(0, 1, 2, 0), dInfo.card_adv_color[0], 0xff000000, true, false, 0);
+		DrawShadowText(numFont, dInfo.str_card_count[0], Resize(595, 31, 625, 50), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
+
+		DrawShadowText(numFont, dInfo.str_card_count[1], Resize(695, 31, 725, 50), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true, false, 0);
+		DrawShadowText(numFont, dInfo.str_card_adv[1], Resize(725, 31, 755, 50), Resize(0, 1, 2, 0), dInfo.card_adv_color[1], 0xff000000, true, false, 0);
 	}
 	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);

gframe/game.h

@@ -69,6 +69,8 @@ struct DuelInfo {
 	bool tag_player[2];
 	int lp[2];
 	int start_lp[2];
+	int card_count[2];
+	int card_adv;
 	int duel_rule;
 	int turn;
 	short curMsg;
@@ -85,6 +87,9 @@ struct DuelInfo {
 	wchar_t str_time_limit[16];
 	wchar_t str_time_left[2][16];
 	video::SColor time_color[2];
+	wchar_t str_card_adv[2][16];
+	wchar_t str_card_count[2][16];
+	video::SColor card_adv_color[2];
 	bool isReplaySwapped;
 };