rename vars

gframe/game.cpp

@@ -1551,6 +1551,7 @@ void Game::OnResize() {
 	wANAttribute->setRelativePosition(ResizeWin(500, 200, 830, 285));
 	wANRace->setRelativePosition(ResizeWin(480, 200, 850, 410));
 	wReplaySave->setRelativePosition(ResizeWin(510, 200, 820, 320));
+
 	stHintMsg->setRelativePosition(ResizeWin(500, 60, 820, 90));
 
 	//sound / music volume bar
@@ -1597,8 +1598,8 @@ void Game::OnResize() {
 		btnReset->setRelativePosition(recti(1, 1, width, height));
 	}
 
-	wCardImg->setRelativePosition(ResizeCard(1, 1, 20, 18));
-	imgCard->setRelativePosition(ResizeCard(10, 9, 0, 0));
+	wCardImg->setRelativePosition(ResizeCardImgWin(1, 1, 20, 18));
+	imgCard->setRelativePosition(ResizeCardImgWin(10, 9, 0, 0));
 	wInfos->setRelativePosition(Resize(1, 275, 301, 639));
 	stName->setRelativePosition(recti(10, 10, 300 * xScale - 13, 10 + 22));
 	lstLog->setRelativePosition(Resize(10, 10, 290, 290));
@@ -1656,12 +1657,12 @@ position2di Game::ResizeReverse(s32 x, s32 y) {
 	return position2di(x, y);
 }
 recti Game::ResizeWin(s32 x, s32 y, s32 x2, s32 y2) {
-	s32 sx = x2 - x;
-	s32 sy = y2 - y;
-	x = (x + sx / 2) * xScale - sx / 2;
-	y = (y + sy / 2) * yScale - sy / 2;
-	x2 = sx + x;
-	y2 = sy + y;
+	s32 w = x2 - x;
+	s32 h = y2 - y;
+	x = (x + w / 2) * xScale - w / 2;
+	y = (y + h / 2) * yScale - h / 2;
+	x2 = w + x;
+	y2 = h + y;
 	return recti(x, y, x2, y2);
 }
 recti Game::ResizePhaseHint(s32 x, s32 y, s32 x2, s32 y2, s32 width) {
@@ -1671,17 +1672,15 @@ recti Game::ResizePhaseHint(s32 x, s32 y, s32 x2, s32 y2, s32 width) {
 	y2 = y2 * yScale;
 	return recti(x, y, x2, y2);
 }
-recti Game::ResizeCard(s32 x, s32 y, s32 x2, s32 y2) {
+recti Game::ResizeCardImgWin(s32 x, s32 y, s32 mx, s32 my) {
 	float mul = xScale;
 	if(xScale > yScale)
 		mul = yScale;
-	s32 sx = CARD_IMG_WIDTH * mul + x2 * xScale;
-	s32 sy = CARD_IMG_HEIGHT * mul + y2 * yScale;
+	s32 w = CARD_IMG_WIDTH * mul + mx * xScale;
+	s32 h = CARD_IMG_HEIGHT * mul + my * yScale;
 	x = x * xScale;
 	y = y * yScale;
-	x2 = sx + x;
-	y2 = sy + y;
-	return recti(x, y, x2, y2);
+	return recti(x, y, x + w, y + h);
 }
 recti Game::ResizeCardHint(s32 x, s32 y, s32 x2, s32 y2) {
 	return ResizeCardMid(x, y, x2, y2, (x + x2) * 0.5, (y + y2) * 0.5);

gframe/game.h

@@ -162,7 +162,7 @@ public:
 	position2di ResizeReverse(s32 x, s32 y);
 	recti ResizePhaseHint(s32 x, s32 y, s32 x2, s32 y2, s32 width);
 	recti ResizeWin(s32 x, s32 y, s32 x2, s32 y2);
-	recti ResizeCard(s32 x, s32 y, s32 x2, s32 y2);
+	recti ResizeCardImgWin(s32 x, s32 y, s32 mx, s32 my);
 	recti ResizeCardHint(s32 x, s32 y, s32 x2, s32 y2);
 	position2di ResizeCardHint(s32 x, s32 y);
 	recti ResizeCardMid(s32 x, s32 y, s32 x2, s32 y2, s32 midx, s32 midy);