From de7aefdc6261683908ef32947a0bd54585f20f5d Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Sat, 25 Mar 2023 02:39:52 +0900 Subject: [PATCH] [VM][SVI3X8] Fix FTBFS. --- source/src/vm/svi3x8/joystick.h | 2 +- source/src/vm/svi3x8/memory_ex.h | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/src/vm/svi3x8/joystick.h b/source/src/vm/svi3x8/joystick.h index 096f766e2..08ba8666a 100644 --- a/source/src/vm/svi3x8/joystick.h +++ b/source/src/vm/svi3x8/joystick.h @@ -37,7 +37,7 @@ public: // common functions void initialize() override; - void event_frame(); + void event_frame() override; // void write_signal(int id, uint32_t data, uint32_t mask) override; bool process_state(FILEIO* state_fio, bool loading) override; diff --git a/source/src/vm/svi3x8/memory_ex.h b/source/src/vm/svi3x8/memory_ex.h index a6b31f7af..c4d5d7f7c 100644 --- a/source/src/vm/svi3x8/memory_ex.h +++ b/source/src/vm/svi3x8/memory_ex.h @@ -74,33 +74,33 @@ public: uint32_t __FASTCALL read_io8(uint32_t addr) override; void __FASTCALL write_io8(uint32_t addr, uint32_t data) override; // unique functions - void open_cart(const _TCHAR *file_path) override; - void close_cart() override; - bool load_cart(const _TCHAR *file_path/*, uint8_t *rom*/) override; - bool is_cart_inserted() override + void open_cart(const _TCHAR *file_path); + void close_cart(); + bool load_cart(const _TCHAR *file_path/*, uint8_t *rom*/); + bool is_cart_inserted() { return inserted; } - bool play_tape(const _TCHAR* file_path) override; -// bool rec_tape(const _TCHAR* file_path) override; - void close_tape() override; + bool play_tape(const _TCHAR* file_path); +// bool rec_tape(const _TCHAR* file_path); + void close_tape(); #if defined(FDD_PATCH_SLOT) void release() override; void set_context_fdd_patch(DEVICE *device) { d_fdpat = device; } - void open_disk(int drv, const _TCHAR* file_path, int bank) override; - void close_disk(int drv) override; - bool is_disk_inserted(int drv) override; - void is_disk_protected(int drv, bool value) override; - bool is_disk_protected(int drv) override; + void open_disk(int drv, const _TCHAR* file_path, int bank); + void close_disk(int drv); + bool is_disk_inserted(int drv); + void is_disk_protected(int drv, bool value); + bool is_disk_protected(int drv); #endif - bool is_tape_inserted() override + bool is_tape_inserted() { return play; } - const _TCHAR* get_message() override + const _TCHAR* get_message() { if (play) return _T("Play"); else return _T("Stop"); -- 2.11.0