mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 04:21:47 +00:00
Renderer compile errors
This commit is contained in:
parent
f540156bbf
commit
4139e67ddb
7 changed files with 10 additions and 18 deletions
|
|
@ -744,8 +744,9 @@ typedef enum
|
||||||
|
|
||||||
RF_BLENDMASK = 0x00000F00, // --Blending modes
|
RF_BLENDMASK = 0x00000F00, // --Blending modes
|
||||||
RF_FULLBRIGHT = 0x00000100, // Sprite is drawn at full brightness
|
RF_FULLBRIGHT = 0x00000100, // Sprite is drawn at full brightness
|
||||||
RF_FULLDARK = 0x00000200, // Sprite is drawn completely dark
|
RF_SEMIBRIGHT = 0x00000200, // Sprite is drawn between sector brightness & full brightness
|
||||||
RF_NOCOLORMAPS = 0x00000400, // Sprite is not drawn with colormaps
|
RF_FULLDARK = 0x00000400, // Sprite is drawn completely dark
|
||||||
|
RF_NOCOLORMAPS = 0x00000800, // Sprite is not drawn with colormaps
|
||||||
|
|
||||||
RF_SPRITETYPEMASK = 0x00007000, // ---Different sprite types
|
RF_SPRITETYPEMASK = 0x00007000, // ---Different sprite types
|
||||||
RF_PAPERSPRITE = 0x00001000, // Paper sprite
|
RF_PAPERSPRITE = 0x00001000, // Paper sprite
|
||||||
|
|
|
||||||
|
|
@ -1032,8 +1032,8 @@ void R_ExecuteSetViewSize(void)
|
||||||
for (i = 0; i < j; i++)
|
for (i = 0; i < j; i++)
|
||||||
{
|
{
|
||||||
dy = ((i - viewheight*8)<<FRACBITS) + FRACUNIT/2;
|
dy = ((i - viewheight*8)<<FRACBITS) + FRACUNIT/2;
|
||||||
dy = FixedMul(abs(dy), fovtan);
|
dy = FixedMul(abs(dy), fovtan[s]);
|
||||||
yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
|
yslopetab[s][i] = FixedDiv(centerx*FRACUNIT, dy);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ds_su)
|
if (ds_su)
|
||||||
|
|
|
||||||
|
|
@ -908,7 +908,6 @@ void R_DrawSinglePlane(visplane_t *pl)
|
||||||
{
|
{
|
||||||
INT32 top, bottom;
|
INT32 top, bottom;
|
||||||
|
|
||||||
itswater = true;
|
|
||||||
if (spanfunctype == SPANDRAWFUNC_TRANS)
|
if (spanfunctype == SPANDRAWFUNC_TRANS)
|
||||||
{
|
{
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
|
|
|
||||||
|
|
@ -1661,7 +1661,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
||||||
|
|
||||||
gxt = FixedMul(tr_x, viewcos);
|
gxt = FixedMul(tr_x, viewcos);
|
||||||
gyt = -FixedMul(tr_y, viewsin);
|
gyt = -FixedMul(tr_y, viewsin);
|
||||||
ds_p->scale1 = FixedDiv(projection, gxt - gyt);
|
ds_p->scale1 = FixedDiv(projection[viewssnum], gxt - gyt);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
ds_p->scale2 = ds_p->scale1;
|
ds_p->scale2 = ds_p->scale1;
|
||||||
|
|
|
||||||
|
|
@ -322,8 +322,8 @@ void R_DrawFloorSprite(vissprite_t *spr)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// note: y from view above of map, is distance far away
|
// note: y from view above of map, is distance far away
|
||||||
xscale = FixedDiv(projection, rot_y);
|
xscale = FixedDiv(projection[viewssnum], rot_y);
|
||||||
yscale = -FixedDiv(projectiony, rot_y);
|
yscale = -FixedDiv(projectiony[viewssnum], rot_y);
|
||||||
|
|
||||||
// projection
|
// projection
|
||||||
v2d[i].x = (centerxfrac + FixedMul(rot_x, xscale))>>FRACBITS;
|
v2d[i].x = (centerxfrac + FixedMul(rot_x, xscale))>>FRACBITS;
|
||||||
|
|
|
||||||
|
|
@ -772,16 +772,6 @@ UINT8 *R_GetSpriteTranslation(vissprite_t *vis)
|
||||||
// New colormap stuff for skins Tails 06-07-2002
|
// New colormap stuff for skins Tails 06-07-2002
|
||||||
if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized)
|
if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized)
|
||||||
return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
|
return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
|
||||||
else if (!(vis->cut & SC_PRECIP)
|
|
||||||
&& vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
|
|
||||||
&& (vis->mobj->player->charflags & SF_DASHMODE)
|
|
||||||
&& ((leveltime/2) & 1))
|
|
||||||
{
|
|
||||||
if (vis->mobj->player->charflags & SF_MACHINE)
|
|
||||||
return R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
|
|
||||||
else
|
|
||||||
return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
|
|
||||||
}
|
|
||||||
else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
|
else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
|
||||||
{
|
{
|
||||||
size_t skinnum = (skin_t*)vis->mobj->skin-skins;
|
size_t skinnum = (skin_t*)vis->mobj->skin-skins;
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@ typedef struct vissprite_s
|
||||||
|
|
||||||
fixed_t gx, gy; // for line side calculation
|
fixed_t gx, gy; // for line side calculation
|
||||||
fixed_t gz, gzt; // global bottom/top for silhouette clipping and sorting with 3D floors
|
fixed_t gz, gzt; // global bottom/top for silhouette clipping and sorting with 3D floors
|
||||||
|
fixed_t pz, pzt; // physical bottom/top
|
||||||
|
|
||||||
fixed_t startfrac; // horizontal position of x1
|
fixed_t startfrac; // horizontal position of x1
|
||||||
fixed_t scale;
|
fixed_t scale;
|
||||||
|
|
@ -187,6 +188,7 @@ typedef struct vissprite_s
|
||||||
fixed_t xscale;
|
fixed_t xscale;
|
||||||
|
|
||||||
// Precalculated top and bottom screen coords for the sprite.
|
// Precalculated top and bottom screen coords for the sprite.
|
||||||
|
fixed_t thingheight; // The actual height of the thing
|
||||||
sector_t *sector; // The sector containing the thing.
|
sector_t *sector; // The sector containing the thing.
|
||||||
INT16 sz, szt;
|
INT16 sz, szt;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue