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

gframe/duelclient.cpp

@@ -1295,10 +1295,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				myswprintf(textBuffer, dataManager.GetSysString(569), dataManager.GetName(select_hint));
 			} else
 				myswprintf(textBuffer, dataManager.GetSysString(560));
-			select_hint = 0;
-			mainGame->stHintMsg->setText(textBuffer);
-		} else
-			mainGame->stHintMsg->setText(dataManager.GetSysString(570));
+		} else {
+			if (select_hint) {
+				myswprintf(textBuffer, dataManager.GetDesc(select_hint));
+			} else
+				myswprintf(textBuffer, dataManager.GetSysString(570));
+		}
+		select_hint = 0;
+		mainGame->stHintMsg->setText(textBuffer);
 		mainGame->stHintMsg->setVisible(true);
 		if (mainGame->dInfo.curMsg == MSG_SELECT_PLACE && mainGame->chkAutoPos->isChecked()) {
 			unsigned int filter;
@@ -3176,6 +3180,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 	case MSG_RELOAD_FIELD: {
 		mainGame->gMutex.Lock();
 		mainGame->dField.Clear();
+		mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
 		int val = 0;
 		for(int i = 0; i < 2; ++i) {
 			int p = mainGame->LocalPlayer(i);
@@ -3291,7 +3296,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			myswprintf(event_string, dataManager.GetSysString(1609), dataManager.GetName(mainGame->dField.current_chain.code));
 			mainGame->dField.last_chain = true;
 		}
-		mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
 		mainGame->gMutex.Unlock();
 		break;
 	}

gframe/game.cpp

@@ -523,14 +523,14 @@ bool Game::Initialize() {
 	wLinkMarks->setDraggable(false);
 	wLinkMarks->setVisible(false);
 	btnMarksOK = env->addButton(recti(45, 45, 75, 75), wLinkMarks, BUTTON_MARKERS_OK, dataManager.GetSysString(1211));
-	btnMark[0] = env->addButton(recti(10, 10, 40, 40), wLinkMarks, -1, L"\x2196");
-	btnMark[1] = env->addButton(recti(45, 10, 75, 40), wLinkMarks, -1, L"\x2191");
-	btnMark[2] = env->addButton(recti(80, 10, 110, 40), wLinkMarks, -1, L"\x2197");
-	btnMark[3] = env->addButton(recti(10, 45, 40, 75), wLinkMarks, -1, L"\x2190");
-	btnMark[4] = env->addButton(recti(80, 45, 110, 75), wLinkMarks, -1, L"\x2192");
-	btnMark[5] = env->addButton(recti(10, 80, 40, 110), wLinkMarks, -1, L"\x2199");
-	btnMark[6] = env->addButton(recti(45, 80, 75, 110), wLinkMarks, -1, L"\x2193");
-	btnMark[7] = env->addButton(recti(80, 80, 110, 110), wLinkMarks, -1, L"\x2198");
+	btnMark[0] = env->addButton(recti(10, 10, 40, 40), wLinkMarks, -1, L"\u2196");
+	btnMark[1] = env->addButton(recti(45, 10, 75, 40), wLinkMarks, -1, L"\u2191");
+	btnMark[2] = env->addButton(recti(80, 10, 110, 40), wLinkMarks, -1, L"\u2197");
+	btnMark[3] = env->addButton(recti(10, 45, 40, 75), wLinkMarks, -1, L"\u2190");
+	btnMark[4] = env->addButton(recti(80, 45, 110, 75), wLinkMarks, -1, L"\u2192");
+	btnMark[5] = env->addButton(recti(10, 80, 40, 110), wLinkMarks, -1, L"\u2199");
+	btnMark[6] = env->addButton(recti(45, 80, 75, 110), wLinkMarks, -1, L"\u2193");
+	btnMark[7] = env->addButton(recti(80, 80, 110, 110), wLinkMarks, -1, L"\u2198");
 	for(int i=0;i<8;i++)
 		btnMark[i]->setIsPushButton(true);
 	//replay window

gframe/gframe.cpp

@@ -94,19 +94,30 @@ int main(int argc, char* argv[]) {
 		} else if(!strcmp(argv[i], "-k")) { // Keep on return
 			exit_on_return = false;
 			keep_on_return = true;
+		} else if(!strcmp(argv[i], "-d")) { // Deck
+			if(i + 2 < argc) { // select deck
+				++i;
+				GetParameterW(ygo::mainGame->gameConf.lastdeck, &argv[i][0]);
+				continue;
+			} else { // open deck
+				exit_on_return = !keep_on_return;
+				if(i < argc) {
+					open_file = true;
+					GetParameterW(open_file_name, &argv[i + 1][0]);
+				}
+				ClickButton(ygo::mainGame->btnDeckEdit);
+				break;
+			}
+		} else if(!strcmp(argv[i], "-c")) { // Create host
+			exit_on_return = !keep_on_return;
+			ygo::mainGame->HideElement(ygo::mainGame->wMainMenu);
+			ClickButton(ygo::mainGame->btnHostConfirm);
+			break;
 		} else if(!strcmp(argv[i], "-j")) { // Join host
 			exit_on_return = !keep_on_return;
 			ClickButton(ygo::mainGame->btnLanMode);
 			ClickButton(ygo::mainGame->btnJoinHost);
 			break;
-		} else if(!strcmp(argv[i], "-d")) { // Deck
-			exit_on_return = !keep_on_return;
-			if(i < argc) {
-				open_file = true;
-				GetParameterW(open_file_name, &argv[i + 1][0]);
-			}
-			ClickButton(ygo::mainGame->btnDeckEdit);
-			break;
 		} else if(!strcmp(argv[i], "-r")) { // Replay
 			exit_on_return = !keep_on_return;
 			if(i < argc) {

gframe/single_mode.cpp

@@ -57,8 +57,13 @@ int SingleMode::SinglePlayThread(void* param) {
 	mainGame->dInfo.clientname[0] = 0;
 	mainGame->dInfo.turn = 0;
 	if(!preload_script(pduel, fname2, slen)) {
-		end_duel(pduel);
-		return 0;
+		wchar_t fname[256];
+		myswprintf(fname, L"./single/%ls", open_file_name);
+		slen = BufferIO::EncodeUTF8(fname, fname2);
+		if(!preload_script(pduel, fname2, slen)) {
+			end_duel(pduel);
+			return 0;
+		}
 	}
 	mainGame->gMutex.Lock();
 	mainGame->HideElement(mainGame->wSinglePlay);
@@ -632,6 +637,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 		case MSG_RELOAD_FIELD: {
 			mainGame->gMutex.Lock();
 			mainGame->dField.Clear();
+			mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
 			int val = 0;
 			for(int p = 0; p < 2; ++p) {
 				mainGame->dInfo.lp[p] = BufferIO::ReadInt32(pbuf);
@@ -694,7 +700,6 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 			BufferIO::ReadInt8(pbuf); //chain count, always 0
 			SinglePlayReload();
 			mainGame->dField.RefreshAllCards();
-			mainGame->dInfo.duel_rule = BufferIO::ReadInt8(pbuf);
 			mainGame->gMutex.Unlock();
 			break;
 		}

strings.conf

@@ -116,6 +116,7 @@
 !system 568 请选择要处理效果的卡
 !system 569 请选择[%ls]的位置
 !system 570 请选择要变成不能使用的卡片区域
+!system 571 请选择要移动到的位置
 !system 1000 卡组
 !system 1001 手卡
 !system 1002 怪兽区
@@ -358,6 +359,7 @@
 !system 1371 攻击↑
 !system 1372 守备↑
 !system 1373 名称↓
+!system 1374 连接标记
 !system 1390 等待行动中...
 !system 1391 等待行动中....
 !system 1392 等待行动中.....