zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 23:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed linkage for fuzzviewheight

Browse source 
- fixed naming conflict with GCC's virtual table.
This commit is contained in:
Christoph Oelckers 2016-12-07 18:39:09 +01:00
parent e4c208602d
commit 6adcba3c4b
3 changed files with 4 additions and 4 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;

2
src/r_main.cpp
View file

@ -118,7 +118,7 @@ static void R_ShutdownRenderer();
extern short *openings; extern short *openings;
extern bool r_fakingunderwater; extern bool r_fakingunderwater;
extern "C" int fuzzviewheight; extern int fuzzviewheight;
extern subsector_t *InSubsector; extern subsector_t *InSubsector;