From e2ae7d8f5d86b81fbad2c256f01dcee6450ab6e0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 9 Apr 2016 12:59:50 +0200 Subject: [PATCH] - removed the unused x and y parameters from DrawTextureParms. --- src/v_draw.cpp | 4 ++-- src/v_video.h | 2 +- src/win32/fb_d3d9.cpp | 4 ++-- src/win32/win32iface.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/v_draw.cpp b/src/v_draw.cpp index 2338c998f2..80a080a441 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -116,10 +116,10 @@ void STACK_ARGS DCanvas::DrawTexture (FTexture *img, double x, double y, int tag { return; } - DrawTextureParms(img, x, y, parms); + DrawTextureParms(img, parms); } -void DCanvas::DrawTextureParms(FTexture *img, double x, double y, DrawParms &parms) +void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms) { #ifndef NO_SWRENDER FTexture::Span unmaskedSpan[2]; diff --git a/src/v_video.h b/src/v_video.h index dbb4f55891..6d3c9c226d 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -266,7 +266,7 @@ protected: bool ClipBox (int &left, int &top, int &width, int &height, const BYTE *&src, const int srcpitch) const; void DrawTextureV(FTexture *img, double x, double y, uint32 tag, va_list tags) = delete; - virtual void DrawTextureParms(FTexture *img, double x, double y, DrawParms &parms); + virtual void DrawTextureParms(FTexture *img, DrawParms &parms); bool ParseDrawTextureTags (FTexture *img, double x, double y, uint32 tag, va_list tags, DrawParms *parms, bool fortext) const; DCanvas() {} diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index c0a0dca572..4ef6fa739a 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -2762,11 +2762,11 @@ void D3DFB::DrawPixel(int x, int y, int palcolor, uint32 color) // //========================================================================== -void D3DFB::DrawTextureParms (FTexture *img, double x, double y, DrawParms &parms) +void D3DFB::DrawTextureParms (FTexture *img, DrawParms &parms) { if (In2D < 2) { - Super::DrawTextureParms(img, x, y, parms); + Super::DrawTextureParms(img, parms); return; } if (!InScene) diff --git a/src/win32/win32iface.h b/src/win32/win32iface.h index ac2ad33a68..9b2754eae1 100644 --- a/src/win32/win32iface.h +++ b/src/win32/win32iface.h @@ -257,7 +257,7 @@ public: void DrawBlendingRect (); FNativeTexture *CreateTexture (FTexture *gametex, bool wrapping); FNativePalette *CreatePalette (FRemapTable *remap); - void DrawTextureParms (FTexture *img, double x, double y, DrawParms &parms); + void DrawTextureParms (FTexture *img, DrawParms &parms); void Clear (int left, int top, int right, int bottom, int palcolor, uint32 color); void Dim (PalEntry color, float amount, int x1, int y1, int w, int h); void FlatFill (int left, int top, int right, int bottom, FTexture *src, bool local_origin);