From 14ab03d1e0fe965460569436f6817c3f42df3869 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 11 Aug 2017 12:27:50 -0400 Subject: [PATCH] Added a further fallback: if all files have an extension but one doesn't, take that one. --- StaticAnalyser/AmstradCPC/StaticAnalyser.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp b/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp index 91059e263..3d476696a 100644 --- a/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp +++ b/StaticAnalyser/AmstradCPC/StaticAnalyser.cpp @@ -18,17 +18,28 @@ static void InspectDataCatalogue( return; } - // If only one file is [potentially] BASIC, run that one. + // If only one file is [potentially] BASIC, run that one; otherwise if only one has no suffix, + // pick that one. int basic_files = 0; + int nonsuffixed_files = 0; size_t last_basic_file = 0; + size_t last_nonsuffixed_file = 0; for(size_t c = 0; c < data_catalogue->files.size(); c++) { + // Check for whether this is [potentially] BASIC. if(!((data_catalogue->files[c].data[18] >> 1) & 7)) { basic_files++; last_basic_file = c; } + + // Check suffix for emptiness. + if(data_catalogue->files[c].type == " ") { + nonsuffixed_files++; + last_nonsuffixed_file = c; + } } - if(basic_files == 1) { - target.loadingCommand = "run\"" + data_catalogue->files[last_basic_file].name + "\n"; + if(basic_files == 1 || nonsuffixed_files == 1) { + size_t selected_file = (basic_files == 1) ? last_basic_file : last_nonsuffixed_file; + target.loadingCommand = "run\"" + data_catalogue->files[selected_file].name + "\n"; return; } @@ -56,7 +67,7 @@ void StaticAnalyser::AmstradCPC::AddTargets( target.amstradcpc.model = AmstradCPCModel::CPC6128; if(!target.tapes.empty()) { - target.loadingCommand = "|tape\nrun\"\n"; + target.loadingCommand = "|tape\nrun\"\n\n"; } if(!target.disks.empty()) {