Merge branch 'master' into server

gframe/CMakeLists.txt

@@ -28,7 +28,7 @@ endif ()
 target_link_libraries (ygopro ocgcore clzma)
 
 if (MSVC)
-    target_link_libraries (ygopro irrlicht freetype sqlite3 event lua)
+    target_link_libraries (ygopro irrlicht freetype sqlite3 event)
     include_directories ( "../irrlicht/include" "../freetype/include" "../event/include" "../sqlite3" )
 else ()
     target_link_libraries (ygopro
@@ -36,7 +36,6 @@ else ()
         ${FREETYPE_LIBRARIES}
         ${SQLITE_LIBRARIES}
         ${LIBEVENT_LIBRARIES}
-        ${LUA_LIBRARIES}
         ${OPENGL_gl_LIBRARY}
     )
     include_directories (

gframe/drawing.cpp

@@ -496,6 +496,7 @@ 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;
@@ -517,6 +518,7 @@ 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

@@ -3143,7 +3143,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->WaitFrameSignal(11);
 			}
 		}
-		if(mainGame->dField.last_chain)
+		if (mainGame->dField.chains.size() > 1) {
+			if (mainGame->dField.last_chain)
 				mainGame->WaitFrameSignal(11);
 			for(int i = 0; i < 5; ++i) {
 				mainGame->dField.chains[ct - 1].solved = false;
@@ -3151,6 +3152,7 @@ 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;
 	}

ocgcore @ 70d40dac

-Subproject commit 6d90b448a0fef4e6f58e39eee957d5ec1d3ef3c7
+Subproject commit 70d40dac1e018c3341c4b498e424fc2eeb63fc41

script @ 856c2ecb

-Subproject commit 23f1cc69a38d0eb41525d8c9638d63d618a725d8
+Subproject commit 856c2ecbc1dbdd60e2d9452d902283d73c27aa09