6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 23:32:28 +00:00
Code Issues Projects Releases Wiki Activity

Added a further fallback: if all files have an extension but one doesn't, take that one.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-11 12:27:50 -04:00
parent 3831fbaca2
commit 14ab03d1e0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
StaticAnalyser/AmstradCPC/StaticAnalyser.cpp
View File

@ -18,17 +18,28 @@ static void InspectDataCatalogue(
return; 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 basic_files = 0;
int nonsuffixed_files = 0;
size_t last_basic_file = 0; size_t last_basic_file = 0;
size_t last_nonsuffixed_file = 0;
for(size_t c = 0; c < data_catalogue->files.size(); c++) { 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)) { if(!((data_catalogue->files[c].data[18] >> 1) & 7)) {
basic_files++; basic_files++;
last_basic_file = c; 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; return;
} }
@ -56,7 +67,7 @@ void StaticAnalyser::AmstradCPC::AddTargets(
target.amstradcpc.model = AmstradCPCModel::CPC6128; target.amstradcpc.model = AmstradCPCModel::CPC6128;
if(!target.tapes.empty()) { if(!target.tapes.empty()) {
target.loadingCommand = "|tape\nrun\"\n"; target.loadingCommand = "|tape\nrun\"\n\n";
} }
if(!target.disks.empty()) { if(!target.disks.empty()) {