diff --git a/src/gl/system/gl_framebuffer.h b/src/gl/system/gl_framebuffer.h index 0c7c922aa..b8b4bd21f 100644 --- a/src/gl/system/gl_framebuffer.h +++ b/src/gl/system/gl_framebuffer.h @@ -76,7 +76,6 @@ public: bool WipeDo(int ticks); void WipeCleanup(); void Swap(); - bool Is8BitMode() { return false; } bool IsHWGammaActive() const { return HWGammaActive; } void SetVSync(bool vsync); diff --git a/src/gl/system/gl_swframebuffer.h b/src/gl/system/gl_swframebuffer.h index 47d409cf9..814120958 100644 --- a/src/gl/system/gl_swframebuffer.h +++ b/src/gl/system/gl_swframebuffer.h @@ -64,11 +64,8 @@ public: void WipeCleanup() override; #ifdef WIN32 - void PaletteChanged() override { } - int QueryNewPalette() override { return 0; } void Blank() override { } bool PaintToWindow() override; - bool Is8BitMode() override { return false; } int GetTrueHeight() override { return TrueHeight; } #endif diff --git a/src/v_video.cpp b/src/v_video.cpp index 2accd1f62..ef02f9466 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -121,11 +121,6 @@ public: void GetFlash(PalEntry &rgb, int &amount) { DBGBREAK; } int GetPageCount() { DBGBREAK; return 0; } bool IsFullscreen() { DBGBREAK; return 0; } -#ifdef _WIN32 - void PaletteChanged() {} - int QueryNewPalette() { return 0; } - bool Is8BitMode() { return false; } -#endif float Gamma; }; diff --git a/src/v_video.h b/src/v_video.h index 7ab433953..98acd52c5 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -451,12 +451,6 @@ public: // Releases the screenshot buffer. virtual void ReleaseScreenshotBuffer() {} -#ifdef _WIN32 - virtual void PaletteChanged () = 0; - virtual int QueryNewPalette () = 0; - virtual bool Is8BitMode() = 0; -#endif - // The original size of the framebuffer as selected in the video menu. int VideoWidth = 0; int VideoHeight = 0; diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index ea53f3aa1..a09986c8d 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -894,27 +894,6 @@ int D3DFB::GetPageCount () return 1; } -//========================================================================== -// -// D3DFB :: PaletteChanged -// -//========================================================================== - -void D3DFB::PaletteChanged () -{ -} - -//========================================================================== -// -// D3DFB :: QueryNewPalette -// -//========================================================================== - -int D3DFB::QueryNewPalette () -{ - return 0; -} - //========================================================================== // // D3DFB :: IsValid diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp index 84ab3ff84..cdce55c90 100644 --- a/src/win32/i_input.cpp +++ b/src/win32/i_input.cpp @@ -616,22 +616,6 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } break; - case WM_PALETTECHANGED: - if ((HWND)wParam == Window) - break; - if (screen != NULL) - { - screen->PaletteChanged (); - } - return DefWindowProc (hWnd, message, wParam, lParam); - - case WM_QUERYNEWPALETTE: - if (screen != NULL) - { - return screen->QueryNewPalette (); - } - return DefWindowProc (hWnd, message, wParam, lParam); - case WM_ERASEBKGND: return true; diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 75c63025e..8ae32ccd1 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -933,8 +933,7 @@ bool I_SetCursor(FTexture *cursorpic) { HCURSOR cursor; - if (cursorpic != NULL && cursorpic->UseType != ETextureType::Null && - (screen == NULL || !screen->Is8BitMode())) + if (cursorpic != NULL && cursorpic->UseType != ETextureType::Null) { // Must be no larger than 32x32. if (cursorpic->GetWidth() > 32 || cursorpic->GetHeight() > 32) diff --git a/src/win32/win32gliface.cpp b/src/win32/win32gliface.cpp index 3726050e0..0d6088f2d 100644 --- a/src/win32/win32gliface.cpp +++ b/src/win32/win32gliface.cpp @@ -1199,15 +1199,6 @@ bool Win32GLFrameBuffer::IsFullscreen() return m_Fullscreen; } -void Win32GLFrameBuffer::PaletteChanged() -{ -} - -int Win32GLFrameBuffer::QueryNewPalette() -{ - return 0; -} - HRESULT Win32GLFrameBuffer::GetHR() { return 0; diff --git a/src/win32/win32gliface.h b/src/win32/win32gliface.h index 09e9e5642..b5cfe3dbf 100644 --- a/src/win32/win32gliface.h +++ b/src/win32/win32gliface.h @@ -61,8 +61,6 @@ public: bool IsFullscreen(); - void PaletteChanged(); - int QueryNewPalette(); void InitializeState(); diff --git a/src/win32/win32swiface.h b/src/win32/win32swiface.h index dba99c5a8..85a621edb 100644 --- a/src/win32/win32swiface.h +++ b/src/win32/win32swiface.h @@ -37,8 +37,6 @@ public: void GetFlash (PalEntry &rgb, int &amount); int GetPageCount (); bool IsFullscreen (); - void PaletteChanged (); - int QueryNewPalette (); void Blank (); bool PaintToWindow (); void SetVSync (bool vsync); @@ -64,7 +62,6 @@ public: bool WipeDo(int ticks); void WipeCleanup(); HRESULT GetHR (); - bool Is8BitMode() { return false; } virtual int GetTrueHeight() { return TrueHeight; } private: