Merge remote-tracking branch 'origin/dancingsprites' into qzdoom

This commit is contained in:
Magnus Norddahl 2016-10-29 06:14:22 +02:00
commit deaced4bfa
2 changed files with 2 additions and 3 deletions

View file

@ -254,7 +254,6 @@ bool sprflipvert;
void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *span, bool useRt) void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *span, bool useRt)
{ {
int pixelsize = r_swtruecolor ? 4 : 1; int pixelsize = r_swtruecolor ? 4 : 1;
int inputpixelsize = (r_swtruecolor && !drawer_needs_pal_input) ? 4 : 1;
while (span->Length != 0) while (span->Length != 0)
{ {
const int length = span->Length; const int length = span->Length;

View file

@ -126,7 +126,7 @@ extern double pspriteyscale;
extern FTexture *WallSpriteTile; extern FTexture *WallSpriteTile;
void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *spans, bool usrRt); void R_DrawMaskedColumn (const BYTE *column, const FTexture::Span *spans, bool useRt);
void R_WallSpriteColumn (bool useRt); void R_WallSpriteColumn (bool useRt);
void R_CacheSprite (spritedef_t *sprite); void R_CacheSprite (spritedef_t *sprite);