diff --git a/src/spice2x/launcher/launcher.cpp b/src/spice2x/launcher/launcher.cpp index cfe4a19..a82f996 100644 --- a/src/spice2x/launcher/launcher.cpp +++ b/src/spice2x/launcher/launcher.cpp @@ -300,10 +300,14 @@ int main_implementation(int argc, char *argv[]) { cfg::CONFIGURATOR_TYPE = cfg::ConfigType::Config; cfg_run = true; } - if (options[launcher::Options::EAmusementEmulation].value_bool()) { + + // -ea, but ignored if -url is set + if (options[launcher::Options::EAmusementEmulation].value_bool() && + !options[launcher::Options::ServiceURL].is_active()) { avs::ea3::URL_SLASH = 1; easrv_port = 8080; } + if (options[launcher::Options::SmartEAmusement].value_bool()) { easrv_smart = true; } @@ -1313,25 +1317,6 @@ int main_implementation(int argc, char *argv[]) { ); } - if (options[launcher::Options::EAmusementEmulation].value_bool() && - options[launcher::Options::ServiceURL].is_active() && - !cfg::CONFIGURATOR_STANDALONE) { - log_warning( - "launcher", - "BAD EAMUSE SETTINGS ERROR\n\n\n" - "-------------------------------------------------------------------\n" - "WARNING - WARNING - WARNING - WARNING - WARNING - WARNING - WARNING\n" - "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" - "A service URL is set **AND** E-Amusement emulation is enabled.\n" - "Either remove the service URL, or disable E-Amusement emulation.\n" - "Otherwise you may experience problems logging in.\n" - "-------------------------------------------------------------------\n\n\n" - ); - log_fatal( - "launcher", - "BAD EAMUSE SETTINGS ERROR: both -ea and -url are set"); - } - if (options[launcher::Options::FullscreenResolution].is_active()) { std::pair result; if (parse_width_height(options[launcher::Options::FullscreenResolution].value_text(), result)) {