diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index b28a0553c2..b9311ce4fc 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/src/gl/renderer/gl_renderer.cpp @@ -299,7 +299,7 @@ void FGLRenderer::ClearBorders() // //========================================================================== -void FGLRenderer::DrawTexture(FTexture *img, DCanvas::DrawParms &parms) +void FGLRenderer::DrawTexture(FTexture *img, DrawParms &parms) { double xscale = parms.destwidth / parms.texwidth; double yscale = parms.destheight / parms.texheight; diff --git a/src/gl/renderer/gl_renderer.h b/src/gl/renderer/gl_renderer.h index 6a1c2f9a2a..2a37635512 100644 --- a/src/gl/renderer/gl_renderer.h +++ b/src/gl/renderer/gl_renderer.h @@ -110,7 +110,7 @@ public: void Begin2D(); void ClearBorders(); - void DrawTexture(FTexture *img, DCanvas::DrawParms &parms); + void DrawTexture(FTexture *img, DrawParms &parms); void DrawLine(int x1, int y1, int x2, int y2, int palcolor, uint32 color); void DrawPixel(int x1, int y1, int palcolor, uint32 color); void Dim(PalEntry color, float damount, int x1, int y1, int w, int h); diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index 8d87d7d6ae..31bc2b0693 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/src/gl/system/gl_framebuffer.cpp @@ -402,14 +402,9 @@ bool OpenGLFrameBuffer::Begin2D(bool) // //========================================================================== -void STACK_ARGS OpenGLFrameBuffer::DrawTextureV(FTexture *img, double x0, double y0, uint32 tag, va_list tags) +void STACK_ARGS OpenGLFrameBuffer::DrawTextureParms(FTexture *img, DrawParms &parms) { - DrawParms parms; - - if (ParseDrawTextureTags(img, x0, y0, tag, tags, &parms, true)) - { - if (GLRenderer != NULL) GLRenderer->DrawTexture(img, parms); - } + if (GLRenderer != NULL) GLRenderer->DrawTexture(img, parms); } //========================================================================== diff --git a/src/gl/system/gl_framebuffer.h b/src/gl/system/gl_framebuffer.h index 501d409253..9c87e9dc8b 100644 --- a/src/gl/system/gl_framebuffer.h +++ b/src/gl/system/gl_framebuffer.h @@ -58,7 +58,7 @@ public: virtual void ReleaseScreenshotBuffer(); // 2D drawing - void STACK_ARGS DrawTextureV(FTexture *img, double x, double y, uint32 tag, va_list tags); + void DrawTextureParms(FTexture *img, DrawParms &parms); void DrawLine(int x1, int y1, int x2, int y2, int palcolor, uint32 color); void DrawPixel(int x1, int y1, int palcolor, uint32 color); void Clear(int left, int top, int right, int bottom, int palcolor, uint32 color);