--- nono/vm/x68kio.h 2026/04/29 17:05:29 1.1.1.4 +++ nono/vm/x68kio.h 2026/04/29 17:06:01 1.1.1.6 @@ -43,8 +43,8 @@ class X68kIODevice : public MainbusBaseD inline IODevice *Decoder(bool super, uint32 addr) const; inline void CheckCI(busaddr addr); - DECLARE_MONITOR_CALLBACK(MonitorUpdate); - DECLARE_MONITOR_CALLBACK(MonitorUpdateAreaset); + DECLARE_MONITOR_SCREEN(MonitorScreen); + DECLARE_MONITOR_SCREEN(MonitorScreenAreaset); std::unique_ptr pADPCM {}; std::unique_ptr pAreaSet {}; @@ -84,10 +84,10 @@ class X68kIODevice : public MainbusBaseD bool cut_fc2 {}; // FC2 ピンカットなら true - Monitor monitor { this }; - Monitor monitor_area { this }; + Monitor *map_monitor {}; + Monitor *area_monitor {}; }; -static inline X68kIODevice *GetX68kIODevice() { +inline X68kIODevice *GetX68kIODevice() { return Object::GetObject(OBJ_X68KIO); }