- Fixed: cycle_t was still a DWORD and not a QWORD under GCC.
- 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:
parent
06630b0fee
commit
c412b42703
175 changed files with 1489 additions and 1341 deletions
|
|
@ -120,7 +120,7 @@ CVAR (Bool, r_particles, true, 0);
|
|||
// [RH] Removed checks for coexistance of rotation 0 with other
|
||||
// rotations and made it look more like BOOM's version.
|
||||
//
|
||||
static void R_InstallSpriteLump (int lump, unsigned frame, char rot, BOOL flipped)
|
||||
static void R_InstallSpriteLump (int lump, unsigned frame, char rot, bool flipped)
|
||||
{
|
||||
unsigned rotation;
|
||||
|
||||
|
|
@ -453,6 +453,7 @@ void R_InitSkins (void)
|
|||
|
||||
remove = false;
|
||||
basetype = NULL;
|
||||
transtype = NULL;
|
||||
|
||||
// Data is stored as "key = data".
|
||||
while (SC_GetString ())
|
||||
|
|
@ -2194,7 +2195,7 @@ void R_ProjectParticle (particle_t *particle, const sector_t *sector, int shade,
|
|||
int x1, x2, y1, y2;
|
||||
vissprite_t* vis;
|
||||
sector_t* heightsec = NULL;
|
||||
byte* map;
|
||||
BYTE* map;
|
||||
|
||||
// transform the origin point
|
||||
tr_x = particle->x - viewx;
|
||||
|
|
@ -2366,9 +2367,9 @@ void R_DrawParticle (vissprite_t *vis)
|
|||
{
|
||||
DWORD *bg2rgb;
|
||||
int spacing;
|
||||
byte *dest;
|
||||
BYTE *dest;
|
||||
DWORD fg;
|
||||
byte color = vis->colormap[vis->startfrac];
|
||||
BYTE color = vis->colormap[vis->startfrac];
|
||||
int yl = vis->gz;
|
||||
int ycount = vis->gzt - yl + 1;
|
||||
int x1 = vis->x1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue