From e7c4a88fd6973346f38f5d556cbe25a8e59bcf7c Mon Sep 17 00:00:00 2001 From: Dan Date: Sat, 9 Nov 2024 16:16:58 -0800 Subject: [PATCH] vortexcli fixes for vortexlib changes and fix warning --- VortexEngine/VortexCLI/VortexCLI.cpp | 6 +++--- VortexEngine/src/Menus/MenuList/EditorConnection.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VortexEngine/VortexCLI/VortexCLI.cpp b/VortexEngine/VortexCLI/VortexCLI.cpp index 346cb96c39..89ca527e04 100644 --- a/VortexEngine/VortexCLI/VortexCLI.cpp +++ b/VortexEngine/VortexCLI/VortexCLI.cpp @@ -485,7 +485,7 @@ bool VortexCLI::init(int argc, char *argv[]) } // do the vortex init/setup - Vortex::init(); + Vortex::initEx(); // configure the vortex engine as the parameters dictate Vortex::setInstantTimestep(m_noTimestep); @@ -632,10 +632,10 @@ void VortexCLI::cleanup() } if (m_jsonMode & JSON_MODE_WRITE_STDOUT) { // dump the current save in json format - Vortex::dumpJson(nullptr, m_jsonPretty); + Vortex::printJson(m_jsonPretty); } if (m_jsonMode & JSON_MODE_WRITE_FILE) { - Vortex::dumpJson(m_jsonOutFile.c_str(), m_jsonPretty); + Vortex::printJsonToFile(m_jsonOutFile.c_str(), m_jsonPretty); printf("Wrote JSON to file [%s]\n", m_jsonOutFile.c_str()); } if (m_writeSaveFile.length() > 0) { diff --git a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp index c52418dee4..c8dade7503 100644 --- a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp +++ b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp @@ -87,6 +87,7 @@ Menu::MenuAction EditorConnection::run() // operate on the state of the editor connection switch (m_state) { case STATE_DISCONNECTED: + default: // not connected yet so check for connections if (!SerialComs::isConnected()) { if (!SerialComs::checkSerial()) {