1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-21 21:33:54 +00:00

Simplify actions.

This commit is contained in:
Thomas Harte 2024-05-27 14:54:09 -04:00
parent 3110041a06
commit edc7fe9c72

View File

@ -243,7 +243,6 @@ class ConcreteMachine:
executor_.bus.read(address + 16, y2, false); executor_.bus.read(address + 16, y2, false);
switch(autoload_phase_) { switch(autoload_phase_) {
default: break; default: break;
case AutoloadPhase::WaitingForDiskContents: { case AutoloadPhase::WaitingForDiskContents: {
@ -266,15 +265,12 @@ class ConcreteMachine:
.click(0); .click(0);
if(target_program_.empty()) { if(target_program_.empty()) {
builder.set_phase(AutoloadPhase::Ended); autoload_phase_ = AutoloadPhase::Ended;
} else { } else {
builder autoload_phase_ = AutoloadPhase::WaitingForDiskContents;
.set_phase(AutoloadPhase::WaitingForDiskContents) builder.move_to(IconBarDriveX, 80); // Just a guess of 'close' to where the program to launch
.move_to(IconBarDriveX, 80); // Just a guess of 'close' to where the program to launch
// will probably be, to have the cursor broadly nearby. // will probably be, to have the cursor broadly nearby.
} }
autoload_phase_ = AutoloadPhase::OpeningDisk;
} }
break; break;
} }
@ -623,7 +619,6 @@ class ConcreteMachine:
enum class AutoloadPhase { enum class AutoloadPhase {
WaitingForStartup, WaitingForStartup,
OpeningDisk,
WaitingForDiskContents, WaitingForDiskContents,
WaitingForTargetIcon, WaitingForTargetIcon,
OpeningProgram, OpeningProgram,