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

gframe/client_field.cpp

@@ -65,6 +65,8 @@ void ClientField::Clear() {
 	overlay_cards.clear();
 	extra_p_count[0] = 0;
 	extra_p_count[1] = 0;
+	player_desc_hints[0].clear();
+	player_desc_hints[1].clear();
 	chains.clear();
 	activatable_cards.clear();
 	summonable_cards.clear();

gframe/drawing.cpp

@@ -281,6 +281,20 @@ void Game::DrawCard(ClientCard* pcard) {
 	}
 	if(pcard->is_moving)
 		return;
+	if(pcard->is_selectable && (pcard->location & 0xe)) {
+		float cv[4] = {1.0f, 1.0f, 0.0f, 1.0f};
+		if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
+			DrawSelectionLine(matManager.vCardOutline, !pcard->is_selected, 2, cv);
+		else
+			DrawSelectionLine(matManager.vCardOutliner, !pcard->is_selected, 2, cv);
+	}
+	if(pcard->is_highlighting) {
+		float cv[4] = {0.0f, 1.0f, 1.0f, 1.0f};
+		if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
+			DrawSelectionLine(matManager.vCardOutline, true, 2, cv);
+		else
+			DrawSelectionLine(matManager.vCardOutliner, true, 2, cv);
+	}
 	irr::core::matrix4 im;
 	im.setTranslation(pcard->curPos);
 	driver->setTransform(irr::video::ETS_WORLD, im);
@@ -301,20 +315,6 @@ void Game::DrawCard(ClientCard* pcard) {
 		driver->setMaterial(matManager.mTexture);
 		driver->drawVertexPrimitiveList(matManager.vNegate, 4, matManager.iRectangle, 2);
 	}
-	if(pcard->is_selectable && (pcard->location & 0xe)) {
-		float cv[4] = {1.0f, 1.0f, 0.0f, 1.0f};
-		if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
-			DrawSelectionLine(matManager.vCardOutline, !pcard->is_selected, 2, cv);
-		else
-			DrawSelectionLine(matManager.vCardOutliner, !pcard->is_selected, 2, cv);
-	}
-	if(pcard->is_highlighting) {
-		float cv[4] = {0.0f, 1.0f, 1.0f, 1.0f};
-		if((pcard->location == LOCATION_HAND && pcard->code) || ((pcard->location & 0xc) && (pcard->position & POS_FACEUP)))
-			DrawSelectionLine(matManager.vCardOutline, true, 2, cv);
-		else
-			DrawSelectionLine(matManager.vCardOutliner, true, 2, cv);
-	}
 	if(pcard->cmdFlag & COMMAND_ATTACK) {
 		matManager.mTexture.setTexture(0, imageManager.tAttack);
 		driver->setMaterial(matManager.mTexture);