OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: cycle_t was still a DWORD and not a QWORD under GCC.

Browse source 
- The stat meters now return an FString instead of sprintfing into a fixed
  output buffer.
- NOASM is now automatically defined when compiling for a non-x86 target.
- Some changes have been made to the integral types in doomtype.h:
  - For consistancy with the other integral types, byte is no longer a
    synonym for BYTE.
  - Most uses of BOOL have been change to the standard C++ bool type. Those
    that weren't were changed to INTBOOL to indicate they may contain values
    other than 0 or 1 but are still used as a boolean.
  - Compiler-provided types with explicit bit sizes are now used. In
    particular, DWORD is no longer a long so it will work with both 64-bit
    Windows and Linux.
  - Since some files need to include Windows headers, uint32 is a synonym
    for the non-Windows version of DWORD.
- Removed d_textur.h. The pic_t struct it defined was used nowhere, and that
  was all it contained.


SVN r326 (trunk)
This commit is contained in:
Randy Heit 2006-09-14 00:02:31 +00:00
commit c412b42703
175 changed files with 1489 additions and 1341 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/r_plane.cpp
View file

@ -118,7 +118,7 @@ extern "C" {
// spanend holds the end of a plane span in each screen row
//
short spanend[MAXHEIGHT];
byte *tiltlighting[MAXWIDTH];
BYTE *tiltlighting[MAXWIDTH];
int planeshade;
vec3_t plane_sz, plane_su, plane_sv;
@ -135,11 +135,11 @@ static DWORD xstepscale, ystepscale;
static DWORD basexfrac, baseyfrac;
#ifdef USEASM
extern "C" void R_SetSpanSource_ASM (const byte *flat);
extern "C" void R_SetSpanSource_ASM (const BYTE *flat);
extern "C" void STACK_ARGS R_SetSpanSize_ASM (int xbits, int ybits);
extern "C" void R_SetSpanColormap_ASM (byte *colormap);
extern "C" void R_SetTiltedSpanSource_ASM (const byte *flat);
extern "C" byte *ds_curcolormap, *ds_cursource, *ds_curtiltedsource;
extern "C" void R_SetSpanColormap_ASM (BYTE *colormap);
extern "C" void R_SetTiltedSpanSource_ASM (const BYTE *flat);
extern "C" BYTE *ds_curcolormap, *ds_cursource, *ds_curtiltedsource;
#endif
void R_DrawSinglePlane (visplane_t *, fixed_t alpha, bool masked);
@ -235,7 +235,7 @@ extern "C" {
void STACK_ARGS R_CalcTiltedLighting (fixed_t lval, fixed_t lend, int width)
{
fixed_t lstep;
byte *lightfiller;
BYTE *lightfiller;
int i = 0;
lval = planeshade - lval;
@ -255,7 +255,7 @@ void STACK_ARGS R_CalcTiltedLighting (fixed_t lval, fixed_t lend, int width)
{
if (lval >= NUMCOLORMAPS*FRACUNIT)
{ // Starts beyond the dark end
byte *clight = basecolormap + ((NUMCOLORMAPS-1) << COLORMAPSHIFT);
BYTE *clight = basecolormap + ((NUMCOLORMAPS-1) << COLORMAPSHIFT);
while (lval >= NUMCOLORMAPS*FRACUNIT && i <= width)
{
tiltlighting[i++] = clight;
@ -314,7 +314,7 @@ void R_MapTiltedPlane (int y, int x1)
int x2 = spanend[y];
int width = x2 - x1;
float iz, uz, vz;
byte *fb;
BYTE *fb;
DWORD u, v;
int i;
@ -1221,9 +1221,11 @@ void R_DrawSkyBoxes ()
freehead = &(*freehead)->next;
}
ADD_STAT(skyboxes, out)
ADD_STAT(skyboxes)
{
sprintf (out, "%d skybox planes", numskyboxes);
FString out;
out.Format (out, "%d skybox planes", numskyboxes);
return out;
}
//==========================================================================
@ -1617,7 +1619,7 @@ void R_MapVisPlane (visplane_t *pl, void (*mapfunc)(int y, int x1))
//
//==========================================================================
BOOL R_PlaneInitData ()
bool R_PlaneInitData ()
{
int i;
visplane_t *pl;