diff --git a/src/EntityConverter.cpp b/src/EntityConverter.cpp index e9ad9ca..7aadede 100644 --- a/src/EntityConverter.cpp +++ b/src/EntityConverter.cpp @@ -33,9 +33,11 @@ -EntityConverter::EntityConverter (const std::string &entityMapFile) : - OFFSET_PLAYER(32.0), OFFSET_PICKUP(2.0), BRIGHTNESS_ADJUST(50.0), - OUTPUT_PRECISION(10) +EntityConverter::EntityConverter (const std::string &entityMapFile) + : OFFSET_PLAYER(32.0), + OFFSET_PICKUP(2.0), + BRIGHTNESS_ADJUST(50.0), + OUTPUT_PRECISION(6) { //MUST RUN extractMapInfo method after this constructor haveMapInfo_ = false; @@ -53,7 +55,7 @@ EntityConverter::EntityConverter (const std::string &entityMapFile) : EntityConverter::EntityConverter (const std::string &entityMapFile, const std::string &reflexMapFile) : OFFSET_PLAYER(32.0), - OFFSET_PICKUP(2.0), BRIGHTNESS_ADJUST(50.0), OUTPUT_PRECISION(10) + OFFSET_PICKUP(2.0), BRIGHTNESS_ADJUST(50.0), OUTPUT_PRECISION(6) { haveMapInfo_ = false; // game modes default to enabled diff --git a/src/main.cpp b/src/main.cpp index 8db3573..2830e00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -126,11 +126,22 @@ void convert_entities(const cxxopts::Options &o, const vector > & int main(int argc, char** argv) { + try { cxxopts::Options p = arguments(argc, argv); - vector > entities; bool is_ok = convert_worldspawn(p, entities); // print_entities(entities); convert_entities(p, entities); + } + catch (cxxopts::option_not_exists_exception e) { + cerr << e.what() << endl + << "./reflex2q3 -h for usage information" << endl; + return -1; + } + catch (std::exception &e) { + cerr << e.what() << endl; + return -2; + } + return(0); }