Merge branch 'master' of github.com:Fluorohydride/ygopro

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,26 +496,28 @@ void Game::DrawMisc() {
 		driver->setTransform(irr::video::ETS_WORLD, im);
 		driver->drawVertexPrimitiveList(matManager.vActivate, 4, matManager.iRectangle, 2);
 	}
-	for(size_t i = 0; i < dField.chains.size(); ++i) {
-		if(dField.chains[i].solved)
-			break;
-		matManager.mTRTexture.setTexture(0, imageManager.tChain);
-		matManager.mTRTexture.AmbientColor = 0xffffff00;
-		ic.setRotationRadians(act_rot);
-		ic.setTranslation(dField.chains[i].chain_pos);
-		driver->setMaterial(matManager.mTRTexture);
-		driver->setTransform(irr::video::ETS_WORLD, ic);
-		driver->drawVertexPrimitiveList(matManager.vSymbol, 4, matManager.iRectangle, 2);
-		it.setScale(0.6f);
-		it.setTranslation(dField.chains[i].chain_pos);
-		matManager.mTRTexture.setTexture(0, imageManager.tNumber);
-		matManager.vChainNum[0].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5));
-		matManager.vChainNum[1].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5));
-		matManager.vChainNum[2].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5 + 1));
-		matManager.vChainNum[3].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5 + 1));
-		driver->setMaterial(matManager.mTRTexture);
-		driver->setTransform(irr::video::ETS_WORLD, it);
-		driver->drawVertexPrimitiveList(matManager.vChainNum, 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;
+			matManager.mTRTexture.setTexture(0, imageManager.tChain);
+			matManager.mTRTexture.AmbientColor = 0xffffff00;
+			ic.setRotationRadians(act_rot);
+			ic.setTranslation(dField.chains[i].chain_pos);
+			driver->setMaterial(matManager.mTRTexture);
+			driver->setTransform(irr::video::ETS_WORLD, ic);
+			driver->drawVertexPrimitiveList(matManager.vSymbol, 4, matManager.iRectangle, 2);
+			it.setScale(0.6f);
+			it.setTranslation(dField.chains[i].chain_pos);
+			matManager.mTRTexture.setTexture(0, imageManager.tNumber);
+			matManager.vChainNum[0].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5));
+			matManager.vChainNum[1].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5));
+			matManager.vChainNum[2].TCoords = vector2df(0.19375f * (i % 5), 0.2421875f * (i / 5 + 1));
+			matManager.vChainNum[3].TCoords = vector2df(0.19375f * (i % 5 + 1), 0.2421875f * (i / 5 + 1));
+			driver->setMaterial(matManager.mTRTexture);
+			driver->setTransform(irr::video::ETS_WORLD, it);
+			driver->drawVertexPrimitiveList(matManager.vChainNum, 4, matManager.iRectangle, 2);
+		}
 	}
 	//finish button
 	if(btnCancelOrFinish->isVisible() && dField.select_ready)

gframe/duelclient.cpp

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