Merge branch 'master' into another

.travis.yml

@@ -86,9 +86,8 @@ before_deploy:
     7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip ygopro.app;
   fi
 
-- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://code.mycard.moe/nanahira/ygopro-images/-/archive/master/ygopro-images-master.zip
-- 7z x -y ygopro-images-master.zip > /dev/null
-- mv -f ygopro-images-master pics
+- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://cdn01.moecube.com/images/ygopro-images-zh-CN.zip
+- 7z x -y -opics ygopro-images-zh-CN.zip > /dev/null
 
 - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/moecube/ygopro-starter-pack/archive/master.zip
 - 7z x -y ygopro-starter-pack-master.zip > /dev/null

appveyor.yml

@@ -59,9 +59,8 @@ after_build:
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/windbot/releases/download/latest/WindBot.7z ; exit 0"
   - 7z x -y WindBot.7z
 
-  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://code.mycard.moe/nanahira/ygopro-images/-/archive/master/ygopro-images-master.zip ; exit 0"
-  - 7z x -y ygopro-images-master.zip
-  - mv -f ygopro-images-master pics
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://cdn01.moecube.com/images/ygopro-images-zh-CN.zip ; exit 0"
+  - 7z x -y -opics ygopro-images-zh-CN.zip
 
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/update-koishipro/archive/master.zip ; exit 0"
   - 7z x -y update-koishipro-master.zip

gframe/drawing.cpp

@@ -496,7 +496,6 @@ void Game::DrawMisc() {
 		driver->setTransform(irr::video::ETS_WORLD, im);
 		driver->drawVertexPrimitiveList(matManager.vActivate, 4, matManager.iRectangle, 2);
 	}
-	if(dField.chains.size() > 1) {
 	for(size_t i = 0; i < dField.chains.size(); ++i) {
 		if(dField.chains[i].solved)
 			break;
@@ -518,7 +517,6 @@ void Game::DrawMisc() {
 		driver->setTransform(irr::video::ETS_WORLD, it);
 		driver->drawVertexPrimitiveList(matManager.vChainNum, 4, matManager.iRectangle, 2);
 	}
-	}
 	//finish button
 	if(btnCancelOrFinish->isVisible() && dField.select_ready)
 		DrawSelectionLine(btnCancelOrFinish, 2, 0xffffff00);

gframe/duelclient.cpp

@@ -3185,8 +3185,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->WaitFrameSignal(11);
 			}
 		}
-		if (mainGame->dField.chains.size() > 1) {
-			if (mainGame->dField.last_chain)
+		if(mainGame->dField.last_chain)
 			mainGame->WaitFrameSignal(11);
 		for(int i = 0; i < 5; ++i) {
 			mainGame->dField.chains[ct - 1].solved = false;
@@ -3194,7 +3193,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->dField.chains[ct - 1].solved = true;
 			mainGame->WaitFrameSignal(3);
 		}
-		}
 		mainGame->dField.last_chain = false;
 		return true;
 	}

gframe/premake4.lua

@@ -50,10 +50,10 @@ project "ygopro"
     configuration "not windows"
         includedirs { "/usr/include/freetype2" }
         excludes { "COSOperator.*" }
-        links { "lua5.3-c++", "event_pthreads", "GL", "dl", "pthread" }
+        links { "event_pthreads", "GL", "dl", "pthread" }
     configuration "linux"
         includedirs { "../irrlicht_linux/include" }
-        links { "X11", "Xxf86vm" }
+        links { "lua5.3-c++", "X11", "Xxf86vm" }
         if USE_IRRKLANG then
             links { "IrrKlang" }
             linkoptions{ "-Wl,-rpath=./" }

ocgcore @ 5844a137

-Subproject commit a636af1e4e078d6380303a63b013900b0816fdf7
+Subproject commit 5844a1379953abb9a6071194180109dc30705e21

script @ 4c7d5cd6

-Subproject commit 216c4754fb203fe2f598fee02ace05e54f7cea55
+Subproject commit 4c7d5cd6825c6dc2ccba5fa3a9481de2d1b5fa6b