Skip to content

Y
ygopro
Commit 146ba2d1 authored by nanahira's avatar nanahira
Browse files
Options

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

parents 7ff72281 f42ed605
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 22 deletions
gframe/gframe.cpp
View file @ 146ba2d1
...@@ -82,7 +82,7 @@ int main(int argc, char* argv[]) { ...@@ -82,7 +82,7 @@ int main(int argc, char* argv[]) {
argv[argc] = ptr + 1; argv[argc] = ptr + 1;
j = 0; j = 0;
} }
in_SPACE = FALSE; in_SPACE = false;
break; break;
} }
case ' ': case ' ':
...@@ -93,18 +93,18 @@ int main(int argc, char* argv[]) { ...@@ -93,18 +93,18 @@ int main(int argc, char* argv[]) {
argv[argc][j] = '\0'; argv[argc][j] = '\0';
++argc; ++argc;
} }
in_TEXT = FALSE; in_TEXT = false;
in_SPACE = TRUE; in_SPACE = true;
break; break;
} }
default: { default: {
in_TEXT = TRUE; in_TEXT = true;
if(in_SPACE) { if(in_SPACE) {
argv[argc] = ptr; argv[argc] = ptr;
j = 1; j = 1;
} else } else
++j; ++j;
in_SPACE = FALSE; in_SPACE = false;
break; break;
} }
} }
...@@ -120,37 +120,46 @@ int main(int argc, char* argv[]) { ...@@ -120,37 +120,46 @@ int main(int argc, char* argv[]) {
bool keep_on_return = false; bool keep_on_return = false;
for(int i = 1; i < argc; ++i) { for(int i = 1; i < argc; ++i) {
if(argv[i][0] == '-' && argv[i][1] == 'e') { if(argv[i][0] == '-' && argv[i][1] == 'e' && argv[i][2]) {
ygo::dataManager.LoadDB(&argv[i][2]); ygo::dataManager.LoadDB(&argv[i][2]);
continue; continue;
} }
if(!strcmp(argv[i], "-e")) { // extra database if(!strcmp(argv[i], "-e")) { // extra database
++i; ++i;
if(i < argc)
ygo::dataManager.LoadDB(&argv[i][0]); ygo::dataManager.LoadDB(&argv[i][0]);
continue; continue;
} else if(!strcmp(argv[i], "-n")) { // nickName } else if(!strcmp(argv[i], "-n")) { // nickName
++i; ++i;
if(i < argc) {
wchar_t param[128]; wchar_t param[128];
GetParameterW(param, &argv[i][0]); GetParameterW(param, &argv[i][0]);
ygo::mainGame->ebNickName->setText(param); ygo::mainGame->ebNickName->setText(param);
}
continue; continue;
} else if(!strcmp(argv[i], "-h")) { // Host address } else if(!strcmp(argv[i], "-h")) { // Host address
++i; ++i;
if(i < argc) {
wchar_t param[128]; wchar_t param[128];
GetParameterW(param, &argv[i][0]); GetParameterW(param, &argv[i][0]);
ygo::mainGame->ebJoinHost->setText(param); ygo::mainGame->ebJoinHost->setText(param);
}
continue; continue;
} else if(!strcmp(argv[i], "-p")) { // host Port } else if(!strcmp(argv[i], "-p")) { // host Port
++i; ++i;
if(i < argc) {
wchar_t param[128]; wchar_t param[128];
GetParameterW(param, &argv[i][0]); GetParameterW(param, &argv[i][0]);
ygo::mainGame->ebJoinPort->setText(param); ygo::mainGame->ebJoinPort->setText(param);
}
continue; continue;
} else if(!strcmp(argv[i], "-w")) { // host passWord } else if(!strcmp(argv[i], "-w")) { // host passWord
++i; ++i;
if(i < argc) {
wchar_t param[128]; wchar_t param[128];
GetParameterW(param, &argv[i][0]); GetParameterW(param, &argv[i][0]);
ygo::mainGame->ebJoinPass->setText(param); ygo::mainGame->ebJoinPass->setText(param);
}
continue; continue;
} else if(!strcmp(argv[i], "-k")) { // Keep on return } else if(!strcmp(argv[i], "-k")) { // Keep on return
exit_on_return = false; exit_on_return = false;
...@@ -162,7 +171,7 @@ int main(int argc, char* argv[]) { ...@@ -162,7 +171,7 @@ int main(int argc, char* argv[]) {
continue; continue;
} else { // open deck } else { // open deck
exit_on_return = !keep_on_return; exit_on_return = !keep_on_return;
if(i < argc) { if(i + 1 < argc) {
open_file = true; open_file = true;
GetParameterW(open_file_name, &argv[i + 1][0]); GetParameterW(open_file_name, &argv[i + 1][0]);
} }
...@@ -181,7 +190,7 @@ int main(int argc, char* argv[]) { ...@@ -181,7 +190,7 @@ int main(int argc, char* argv[]) {
break; break;
} else if(!strcmp(argv[i], "-r")) { // Replay } else if(!strcmp(argv[i], "-r")) { // Replay
exit_on_return = !keep_on_return; exit_on_return = !keep_on_return;
if(i < argc) { if(i + 1 < argc) {
open_file = true; open_file = true;
GetParameterW(open_file_name, &argv[i + 1][0]); GetParameterW(open_file_name, &argv[i + 1][0]);
} }
...@@ -191,7 +200,7 @@ int main(int argc, char* argv[]) { ...@@ -191,7 +200,7 @@ int main(int argc, char* argv[]) {
break; break;
} else if(!strcmp(argv[i], "-s")) { // Single } else if(!strcmp(argv[i], "-s")) { // Single
exit_on_return = !keep_on_return; exit_on_return = !keep_on_return;
if(i < argc) { if(i + 1 < argc) {
open_file = true; open_file = true;
GetParameterW(open_file_name, &argv[i + 1][0]); GetParameterW(open_file_name, &argv[i + 1][0]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment