zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Rachael Alexanderson 2016-12-07 16:49:44 -05:00
parent b77927fa6d 6adcba3c4b
commit d12b92e926
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/r_draw_pal.cpp
View File

@ -2564,7 +2564,7 @@ namespace swrenderer
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
DrawSlabPalCommand::DrawSlabPalCommand(int dx, fixed_t v, int dy, fixed_t vi, const uint8_t *vptr, uint8_t *p, const uint8_t *colormap) DrawSlabPalCommand::DrawSlabPalCommand(int dx, fixed_t v, int dy, fixed_t vi, const uint8_t *vptr, uint8_t *p, const uint8_t *colormap)
: _dx(dx), _v(v), _dy(dy), _vi(vi), _vptr(vptr), _p(p), _colormap(colormap) : _dx(dx), _v(v), _dy(dy), _vi(vi), _vvptr(vptr), _p(p), _colormap(colormap)
{ {
using namespace drawerargs; using namespace drawerargs;
_pitch = dc_pitch; _pitch = dc_pitch;
@ -2578,7 +2578,7 @@ namespace swrenderer
int pitch = _pitch; int pitch = _pitch;
int width = _dx; int width = _dx;
const uint8_t *colormap = _colormap; const uint8_t *colormap = _colormap;
const uint8_t *source = _vptr; const uint8_t *source = _vvptr;
fixed_t fracpos = _v; fixed_t fracpos = _v;
fixed_t iscale = _vi; fixed_t iscale = _vi;

2
src/r_draw_pal.h
View File

@ -230,7 +230,7 @@ namespace swrenderer
fixed_t _v; fixed_t _v;
int _dy; int _dy;
fixed_t _vi; fixed_t _vi;
const uint8_t *_vptr; const uint8_t *_vvptr;
uint8_t *_p; uint8_t *_p;
const uint8_t *_colormap; const uint8_t *_colormap;
int _pitch; int _pitch;