Merge branch 'master' into server

gframe/drawing.cpp

@@ -496,28 +496,26 @@ 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;
-			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);
-		}
+	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,15 +3143,13 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				mainGame->WaitFrameSignal(11);
 			}
 		}
-		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);
-			}
+		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;

ocgcore @ a78b48f3

-Subproject commit d8ee620789d02a1a540f5bd788971268870a72ab
+Subproject commit a78b48f3303ba13ee03549117fe996dc32831aaa

script @ 8249a716

-Subproject commit 216c4754fb203fe2f598fee02ace05e54f7cea55
+Subproject commit 8249a716f8128b10f332634bb73cf01d7c67a8fc