Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'

gframe/duelclient.cpp

@@ -1480,10 +1480,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;

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

@@ -58,8 +58,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);