From 567c21cdeb21f0e2ebf5d689f84fa86ac0440e96 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 6 May 2017 10:43:48 +0200 Subject: [PATCH] - fixed recursion in Dim functions. When the main worker function was renamed to DoDim the Super calls were not fixed for it. --- src/gl/system/gl_swframebuffer.cpp | 2 +- src/win32/fb_d3d9.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gl/system/gl_swframebuffer.cpp b/src/gl/system/gl_swframebuffer.cpp index ca153980d..2bf3cf2ee 100644 --- a/src/gl/system/gl_swframebuffer.cpp +++ b/src/gl/system/gl_swframebuffer.cpp @@ -2544,7 +2544,7 @@ void OpenGLSWFrameBuffer::DoDim(PalEntry color, float amount, int x1, int y1, in } if (In2D < 2) { - Super::Dim(color, amount, x1, y1, w, h); + Super::DoDim(color, amount, x1, y1, w, h); return; } if (!InScene) diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index 188d2530e..0ee7a585a 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -2671,7 +2671,7 @@ void D3DFB::DoDim (PalEntry color, float amount, int x1, int y1, int w, int h) } if (In2D < 2) { - Super::Dim(color, amount, x1, y1, w, h); + Super::DoDim(color, amount, x1, y1, w, h); return; } if (!InScene)