From 672c59f970e38c3de46beb95300d7e6ed87b1d9f Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 29 Feb 2020 18:52:47 -0500 Subject: [PATCH] Adds use of `append` with typer. --- Machines/Electron/Electron.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index a5c890207..8caeaf437 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -346,10 +346,10 @@ class ConcreteMachine: } } - cycles_since_display_update_ += Cycles(static_cast(cycles)); - cycles_since_audio_update_ += Cycles(static_cast(cycles)); + cycles_since_display_update_ += Cycles(int(cycles)); + cycles_since_audio_update_ += Cycles(int(cycles)); if(cycles_since_audio_update_ > Cycles(16384)) update_audio(); - tape_.run_for(Cycles(static_cast(cycles))); + tape_.run_for(Cycles(int(cycles))); cycles_until_display_interrupt_ -= cycles; if(cycles_until_display_interrupt_ < 0) { @@ -358,8 +358,8 @@ class ConcreteMachine: queue_next_display_interrupt(); } - if(typer_) typer_->run_for(Cycles(static_cast(cycles))); - if(plus3_) plus3_->run_for(Cycles(4*static_cast(cycles))); + if(typer_) typer_->run_for(Cycles(int(cycles))); + if(plus3_) plus3_->run_for(Cycles(4*int(cycles))); if(shift_restart_counter_) { shift_restart_counter_ -= cycles; if(shift_restart_counter_ <= 0) { @@ -413,7 +413,11 @@ class ConcreteMachine: } void type_string(const std::string &string) final { - Utility::TypeRecipient::add_typer(string, std::make_unique()); + if(typer_) { + typer_->append(string); + } else { + Utility::TypeRecipient::add_typer(string, std::make_unique()); + } } KeyboardMapper *get_keyboard_mapper() final {