Commit d9eb7650ed1bc11de9d96ed9a387501238663094
- Diff rendering mode:
- inline
- side by side
src/main.cpp
(12 / 2)
| 186 | 186 | printHelp(false), | |
| 187 | 187 | printVersion(false), | |
| 188 | 188 | skipUpdate(false), | |
| 189 | skipUpdateLoad(false), | ||
| 189 | 190 | chooseDefault(false), | |
| 190 | 191 | noOpenGL(false), | |
| 191 | 192 | serverPort(0) | |
| … | … | ||
| 195 | 195 | bool printHelp; | |
| 196 | 196 | bool printVersion; | |
| 197 | 197 | bool skipUpdate; | |
| 198 | bool skipUpdateLoad; | ||
| 198 | 199 | bool chooseDefault; | |
| 199 | 200 | bool noOpenGL; | |
| 200 | 201 | std::string username; | |
| … | … | ||
| 555 | 555 | << _(" -p --port : Login server port") << endl | |
| 556 | 556 | << _(" -s --server : Login server name or IP") << endl | |
| 557 | 557 | << _(" -u --skip-update : Skip the update downloads") << endl | |
| 558 | << _(" -l --skip-load : Skip loading the updates") << endl | ||
| 558 | 559 | << _(" -U --username : Login with this username") << endl | |
| 559 | 560 | #ifdef USE_OPENGL | |
| 560 | 561 | << _(" -O --no-opengl : Disable OpenGL for this session") << endl | |
| … | … | ||
| 570 | 570 | ||
| 571 | 571 | static void parseOptions(int argc, char *argv[], Options &options) | |
| 572 | 572 | { | |
| 573 | const char *optstring = "hvud:U:P:Dc:s:p:C:H:S:O"; | ||
| 573 | const char *optstring = "hvuld:U:P:Dc:s:p:C:H:S:O"; | ||
| 574 | 574 | ||
| 575 | 575 | const struct option long_options[] = { | |
| 576 | 576 | { "config-file", required_argument, 0, 'C' }, | |
| … | … | ||
| 584 | 584 | { "port", required_argument, 0, 'p' }, | |
| 585 | 585 | { "server", required_argument, 0, 's' }, | |
| 586 | 586 | { "skip-update", no_argument, 0, 'u' }, | |
| 587 | { "skip-load", no_argument, 0, 'l' }, | ||
| 587 | 588 | { "username", required_argument, 0, 'U' }, | |
| 588 | 589 | { "no-opengl", no_argument, 0, 'O' }, | |
| 589 | 590 | { "version", no_argument, 0, 'v' }, | |
| … | … | ||
| 632 | 632 | case 'u': | |
| 633 | 633 | options.skipUpdate = true; | |
| 634 | 634 | break; | |
| 635 | case 'l': | ||
| 636 | options.skipUpdateLoad = true; | ||
| 637 | break; | ||
| 635 | 638 | case 'U': | |
| 636 | 639 | options.username = optarg; | |
| 637 | 640 | break; | |
| … | … | ||
| 1050 | 1050 | logger->log("State: LOAD DATA"); | |
| 1051 | 1051 | ||
| 1052 | 1052 | // Load the updates downloaded so far... | |
| 1053 | loadUpdates(); | ||
| 1053 | if (!options.skipUpdateLoad) | ||
| 1054 | { | ||
| 1055 | loadUpdates(); | ||
| 1056 | } | ||
| 1054 | 1057 | ||
| 1055 | 1058 | // Also add customdata directory | |
| 1056 | 1059 | ResourceManager::getInstance()->searchAndAddArchives( |
