fix FadeCard

Author: mercury233

gframe/client_card.h

@@ -15,8 +15,9 @@ class ClientCard {
 	irr::core::vector3df curRot;
 	irr::core::vector3df dPos;
 	irr::core::vector3df dRot;
-	irr::u32 curAlpha{ 255 };
-	irr::u32 dAlpha{ 0 };
+	float curAlpha{ 255.0f };
+	float dAlpha{ 0.0f };
+	int targetAlpha{ 255 };
 	irr::u32 aniFrame{ 0 };
 	bool is_moving{ false };
 	bool is_fading{ false };

gframe/client_field.cpp

@@ -1117,7 +1117,8 @@ void ClientField::MoveCard(ClientCard * pcard, int frame60) {
 }
 void ClientField::FadeCard(ClientCard * pcard, int alpha, int frame60) {
 	int frame = mainGame->ScaleFrame(frame60);
-	pcard->dAlpha = (alpha - pcard->curAlpha) / frame;
+	pcard->targetAlpha = alpha;
+	pcard->dAlpha = (pcard->targetAlpha - pcard->curAlpha) / frame;
 	pcard->is_fading = true;
 	pcard->aniFrame = frame;
 }

gframe/drawing.cpp

@@ -405,13 +405,16 @@ void Game::DrawCard(ClientCard* pcard) {
 			pcard->curAlpha += pcard->dAlpha;
 		pcard->aniFrame--;
 		if(pcard->aniFrame == 0) {
+			if(pcard->is_fading)
+				pcard->curAlpha = pcard->targetAlpha;
 			pcard->is_moving = false;
 			pcard->is_fading = false;
 			pcard->chain_code = 0;
 		}
 	}
 	matManager.mCard.AmbientColor = 0xffffffff;
-	matManager.mCard.DiffuseColor = (pcard->curAlpha << 24) | 0xffffff;
+	irr::u32 alpha = myclamp(static_cast<int>(pcard->curAlpha + 0.5f), 0, 255);
+	matManager.mCard.DiffuseColor = (alpha << 24) | 0xffffff;
 	driver->setTransform(irr::video::ETS_WORLD, pcard->mTransform);
 	auto m22 = pcard->mTransform(2, 2);
 	if(m22 > -0.99 || pcard->is_moving) {