otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Replace cumbersome command line output strings test with shared boolean

Browse source
This commit is contained in:
bbbradsmith 2024-12-12 15:52:07 -05:00 committed by tildearrow
parent 8cd283c4e9
commit 6cc5bd8eb5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.cpp
View file

@ -725,14 +725,16 @@ int main(int argc, char** argv) {
return 1; return 1;
} }
if (fileName.empty() && (benchMode || infoMode || outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="")) { const bool outputMode = outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="";
if (fileName.empty() && (benchMode || infoMode || outputMode)) {
logE("provide a file!"); logE("provide a file!");
return 1; return 1;
} }
#ifdef HAVE_GUI #ifdef HAVE_GUI
if (e.preInit(consoleMode || benchMode || infoMode || outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="")) { if (e.preInit(consoleMode || benchMode || infoMode || outputMode)) {
if (consoleMode || benchMode || infoMode || outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="") { if (consoleMode || benchMode || infoMode || outputMode) {
logW("engine wants safe mode, but Furnace GUI is not going to start."); logW("engine wants safe mode, but Furnace GUI is not going to start.");
} else { } else {
safeMode=true; safeMode=true;
@ -744,7 +746,7 @@ int main(int argc, char** argv) {
} }
#endif #endif
if (safeMode && (consoleMode || benchMode || infoMode || outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="")) { if (safeMode && (consoleMode || benchMode || infoMode || outputMode)) {
logE("you can't use safe mode and console/export mode together."); logE("you can't use safe mode and console/export mode together.");
return 1; return 1;
} }
@ -761,7 +763,7 @@ int main(int argc, char** argv) {
#endif #endif
if (!fileName.empty() && ((!e.getConfBool("tutIntroPlayed",TUT_INTRO_PLAYED)) || e.getConfInt("alwaysPlayIntro",0)!=3 || consoleMode || benchMode || infoMode || outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="")) { if (!fileName.empty() && ((!e.getConfBool("tutIntroPlayed",TUT_INTRO_PLAYED)) || e.getConfInt("alwaysPlayIntro",0)!=3 || consoleMode || benchMode || infoMode || outputMode)) {
logI("loading module..."); logI("loading module...");
FILE* f=ps_fopen(fileName.c_str(),"rb"); FILE* f=ps_fopen(fileName.c_str(),"rb");
if (f==NULL) { if (f==NULL) {
@ -853,7 +855,7 @@ int main(int argc, char** argv) {
return 0; return 0;
} }
if (outName!="" || vgmOutName!="" || cmdOutName!="" || txtOutName!="") { if (outputMode) {
if (cmdOutName!="") { if (cmdOutName!="") {
SafeWriter* w=e.saveCommand(); SafeWriter* w=e.saveCommand();
if (w!=NULL) { if (w!=NULL) {