6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-11 08:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Adds use of append with typer.

Browse Source
This commit is contained in:
Thomas Harte 2020-02-29 18:52:47 -05:00
parent 99229df017
commit 672c59f970
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Machines/Electron/Electron.cpp
View File

@ -346,10 +346,10 @@ class ConcreteMachine:
} }
} }
cycles_since_display_update_ += Cycles(static_cast<int>(cycles)); cycles_since_display_update_ += Cycles(int(cycles));
cycles_since_audio_update_ += Cycles(static_cast<int>(cycles)); cycles_since_audio_update_ += Cycles(int(cycles));
if(cycles_since_audio_update_ > Cycles(16384)) update_audio(); if(cycles_since_audio_update_ > Cycles(16384)) update_audio();
tape_.run_for(Cycles(static_cast<int>(cycles))); tape_.run_for(Cycles(int(cycles)));
cycles_until_display_interrupt_ -= cycles; cycles_until_display_interrupt_ -= cycles;
if(cycles_until_display_interrupt_ < 0) { if(cycles_until_display_interrupt_ < 0) {
@ -358,8 +358,8 @@ class ConcreteMachine:
queue_next_display_interrupt(); queue_next_display_interrupt();
} }
if(typer_) typer_->run_for(Cycles(static_cast<int>(cycles))); if(typer_) typer_->run_for(Cycles(int(cycles)));
if(plus3_) plus3_->run_for(Cycles(4*static_cast<int>(cycles))); if(plus3_) plus3_->run_for(Cycles(4*int(cycles)));
if(shift_restart_counter_) { if(shift_restart_counter_) {
shift_restart_counter_ -= cycles; shift_restart_counter_ -= cycles;
if(shift_restart_counter_ <= 0) { if(shift_restart_counter_ <= 0) {
@ -413,7 +413,11 @@ class ConcreteMachine:
} }
void type_string(const std::string &string) final { void type_string(const std::string &string) final {
Utility::TypeRecipient::add_typer(string, std::make_unique<CharacterMapper>()); if(typer_) {
typer_->append(string);
} else {
Utility::TypeRecipient::add_typer(string, std::make_unique<CharacterMapper>());
}
} }
KeyboardMapper *get_keyboard_mapper() final { KeyboardMapper *get_keyboard_mapper() final {