Merge branch 'master' of https://github.com/Fluorohydride/ygopro 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

@@ -457,7 +457,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;
@@ -479,7 +478,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

@@ -2906,8 +2906,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int ct = BufferIO::ReadInt8(pbuf);
 		if(mainGame->dInfo.isReplay && mainGame->dInfo.isReplaySkiping)
 			return true;
-		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;
@@ -2915,7 +2914,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;
 	}

ocgcore @ a1a9faef

-Subproject commit 80f1ced5a185d25d6a421f71a28caacc04e564f2
+Subproject commit a1a9faeff35211e585ce0701c4f0af3fec03b745

script @ 6c12c951

-Subproject commit 216c4754fb203fe2f598fee02ace05e54f7cea55
+Subproject commit 6c12c95149bdcf97758d7e1f8031d868cbb0f888