zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-09 13:00:14 +02:00
commit bc42dd26c8
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/v_draw.cpp
View file

@ -116,10 +116,10 @@ void STACK_ARGS DCanvas::DrawTexture (FTexture *img, double x, double y, int tag
{ {
return; 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 #ifndef NO_SWRENDER
FTexture::Span unmaskedSpan[2]; FTexture::Span unmaskedSpan[2];

2
src/v_video.h
View file

@ -266,7 +266,7 @@ protected:
bool ClipBox (int &left, int &top, int &width, int &height, const BYTE *&src, const int srcpitch) const; 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; 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; bool ParseDrawTextureTags (FTexture *img, double x, double y, uint32 tag, va_list tags, DrawParms *parms, bool fortext) const;
DCanvas() {} DCanvas() {}

4
src/win32/fb_d3d9.cpp
View file

@ -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) if (In2D < 2)
{ {
Super::DrawTextureParms(img, x, y, parms); Super::DrawTextureParms(img, parms);
return; return;
} }
if (!InScene) if (!InScene)

2
src/win32/win32iface.h
View file

@ -257,7 +257,7 @@ public:
void DrawBlendingRect (); void DrawBlendingRect ();
FNativeTexture *CreateTexture (FTexture *gametex, bool wrapping); FNativeTexture *CreateTexture (FTexture *gametex, bool wrapping);
FNativePalette *CreatePalette (FRemapTable *remap); 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 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 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); void FlatFill (int left, int top, int right, int bottom, FTexture *src, bool local_origin);