opt code

Classes/gframe/event_handler.cpp

@@ -1654,7 +1654,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 		case irr::EMIE_LMOUSE_PRESSED_DOWN: {
 			if(!mainGame->dInfo.isStarted)
 				break;
-			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300) {
+			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300 * mainGame->xScale) {
 				mainGame->always_chain = event.MouseInput.isLeftPressed();
 				mainGame->ignore_chain = false;
 				mainGame->chain_when_avail = false;
@@ -1665,7 +1665,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 		case irr::EMIE_RMOUSE_PRESSED_DOWN: {
 			if(!mainGame->dInfo.isStarted)
 				break;
-			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300) {
+			if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300 * mainGame->xScale) {
 				mainGame->ignore_chain = event.MouseInput.isRightPressed();
 				mainGame->always_chain = false;
 				mainGame->chain_when_avail = false;

Classes/gframe/game.cpp

@@ -78,7 +78,7 @@ bool Game::Initialize() {
 
  	//start ygocore when mobile is in landscape mode, or using Android tablets or TV.
 	char log_scale[256] = {0};
-	sprintf(log_scale, "xScale = %f, yScale = %f， xStart=%f, yStart=%f", xScale, yScale, xStart, yStart);
+	sprintf(log_scale, "xScale = %f, yScale = %f", xScale, yScale);
 	Printer::log(log_scale);
 	//io::path databaseDir = options->getDBDir();
 	io::path workingDir = options->getWorkDir();

Classes/gframe/game.h

@@ -529,8 +529,7 @@ public:
 	irr::gui::IGUIButton* btnCancelOrFinish;
 	float xScale;
     float yScale;
-    float xStart;
-    float yStart;
+
 	IYGOSoundEffectPlayer* soundEffectPlayer;
 #ifdef _IRR_ANDROID_PLATFORM_
 	ANDROID_APP appMain;