--- nono/vm/x68kio.cpp 2026/04/29 17:05:28 1.1.1.4 +++ nono/vm/x68kio.cpp 2026/04/29 17:05:32 1.1.1.5 @@ -38,6 +38,7 @@ #include "mainbus.h" #include "mainram.h" #include "mfp.h" +#include "monitor.h" #include "mpu.h" #include "nereid.h" #include "opm.h" @@ -62,15 +63,15 @@ X68kIODevice::X68kIODevice() : inherited(OBJ_X68KIO) { - monitor.func = ToMonitorCallback(&X68kIODevice::MonitorUpdate); - monitor.SetSize(73, 1 + 32); - monitor.SetMaxHeight(1 + 256); - monitor.Regist(ID_SUBWIN_X68KIO); + map_monitor = gMonitorManager->Regist(ID_SUBWIN_X68KIO, this); + map_monitor->func = ToMonitorCallback(&X68kIODevice::MonitorUpdate); + map_monitor->SetSize(73, 1 + 32); + map_monitor->SetMaxHeight(1 + 256); // エリアセットは実質ここが担当しているので、モニタもここ。 - monitor_area.func = ToMonitorCallback(&X68kIODevice::MonitorUpdateAreaset); - monitor_area.SetSize(32, 6); - monitor_area.Regist(ID_MONITOR_AREASET); + area_monitor = gMonitorManager->Regist(ID_MONITOR_AREASET, this); + area_monitor->func = ToMonitorCallback(&X68kIODevice::MonitorUpdateAreaset); + area_monitor->SetSize(32, 6); cut_fc2 = (gConfig->Find("x68k-cut-fc2").AsInt() != 0);