Merge pull request #1948 from mercury233/patch-1

update command line parameters

gframe/gframe.cpp

@@ -94,12 +94,12 @@ 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], "-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
+			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;
@@ -107,6 +107,17 @@ int main(int argc, char* argv[]) {
 				}
 				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], "-r")) { // Replay
 			exit_on_return = !keep_on_return;
 			if(i < argc) {

gframe/single_mode.cpp

@@ -56,10 +56,15 @@ int SingleMode::SinglePlayThread(void* param) {
 	BufferIO::CopyWStr(mainGame->ebNickName->getText(), mainGame->dInfo.hostname, 20);
 	mainGame->dInfo.clientname[0] = 0;
 	mainGame->dInfo.turn = 0;
+	if(!preload_script(pduel, fname2, slen)) {
+		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);
 	mainGame->wCardImg->setVisible(true);