From edc7fe9c7209b52b5e49acf549b3ab28b1ac5324 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 27 May 2024 14:54:09 -0400 Subject: [PATCH] Simplify actions. --- Machines/Acorn/Archimedes/Archimedes.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp index c77490c6b..e87b203dd 100644 --- a/Machines/Acorn/Archimedes/Archimedes.cpp +++ b/Machines/Acorn/Archimedes/Archimedes.cpp @@ -243,7 +243,6 @@ class ConcreteMachine: executor_.bus.read(address + 16, y2, false); switch(autoload_phase_) { - default: break; case AutoloadPhase::WaitingForDiskContents: { @@ -266,15 +265,12 @@ class ConcreteMachine: .click(0); if(target_program_.empty()) { - builder.set_phase(AutoloadPhase::Ended); + autoload_phase_ = AutoloadPhase::Ended; } else { - builder - .set_phase(AutoloadPhase::WaitingForDiskContents) - .move_to(IconBarDriveX, 80); // Just a guess of 'close' to where the program to launch + autoload_phase_ = AutoloadPhase::WaitingForDiskContents; + builder.move_to(IconBarDriveX, 80); // Just a guess of 'close' to where the program to launch // will probably be, to have the cursor broadly nearby. } - - autoload_phase_ = AutoloadPhase::OpeningDisk; } break; } @@ -623,7 +619,6 @@ class ConcreteMachine: enum class AutoloadPhase { WaitingForStartup, - OpeningDisk, WaitingForDiskContents, WaitingForTargetIcon, OpeningProgram,