From 2411f192f72417fe442dfddef598fd2415c678d3 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 1 Oct 2016 21:09:28 -0400 Subject: [PATCH] Switched back to full typing, even for DFS loading. It saves having to worry about sideways RAM filing systems and shift (if that's even the issue). --- StaticAnalyser/Acorn/StaticAnalyser.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/StaticAnalyser/Acorn/StaticAnalyser.cpp b/StaticAnalyser/Acorn/StaticAnalyser.cpp index f15bf1a65..50a5ad478 100644 --- a/StaticAnalyser/Acorn/StaticAnalyser.cpp +++ b/StaticAnalyser/Acorn/StaticAnalyser.cpp @@ -130,16 +130,16 @@ void StaticAnalyser::Acorn::AddTargets( Catalogue::BootOption bootOption = (dfs_catalogue ?: adfs_catalogue)->bootOption; switch(bootOption) { - case Catalogue::BootOption::None: adfs_command = "*CAT\n"; break; - case Catalogue::BootOption::LoadBOOT: adfs_command = "*MOUNT\n*LOAD !BOOT\n"; break; - case Catalogue::BootOption::RunBOOT: adfs_command = "*MOUNT\n*RUN !BOOT\n"; break; - case Catalogue::BootOption::ExecBOOT: adfs_command = "*MOUNT\n*EXEC !BOOT\n"; break; + case Catalogue::BootOption::None: adfs_command = "*CAT\n"; break; + case Catalogue::BootOption::LoadBOOT: adfs_command = "*LOAD !BOOT\n"; break; + case Catalogue::BootOption::RunBOOT: adfs_command = "*RUN !BOOT\n"; break; + case Catalogue::BootOption::ExecBOOT: adfs_command = "*EXEC !BOOT\n"; break; } - if(target.acorn.has_dfs && bootOption != Catalogue::BootOption::None) - target.acorn.should_hold_shift = true; - else - target.loadingCommand = adfs_command; +// if(target.acorn.has_dfs && bootOption != Catalogue::BootOption::None) +// target.acorn.should_hold_shift = true; +// else + target.loadingCommand = (target.acorn.has_dfs ? "" : "*MOUNT\n") + adfs_command; } }