--- nono/vm/videoctlr.h 2026/04/29 17:05:54 1.1.1.13 +++ nono/vm/videoctlr.h 2026/04/29 17:05:59 1.1.1.14 @@ -12,7 +12,6 @@ #include "device.h" #include "bitmap.h" -#include "color.h" #include #include @@ -102,7 +101,7 @@ class VideoCtlrDevice : public IODevice, bool Render(BitmapRGBX& dst); // モニタ更新(下請け) - int MonitorUpdate(TextScreen&, int y, uint32 crtc_r20); + int MonitorScreen(TextScreen&, int y, uint32 crtc_r20); // グラフィック画面を取得。(モニタ用) const BitmapRGBX& GetGraphicBitmap() const { return grbmp; } @@ -186,6 +185,6 @@ class VideoCtlrDevice : public IODevice, VideoRenderer *renderer {}; }; -static inline VideoCtlrDevice *GetVideoCtlrDevice() { +inline VideoCtlrDevice *GetVideoCtlrDevice() { return Object::GetObject(OBJ_VIDEOCTLR); }