- 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
|
|
@ -68,7 +68,7 @@ void R_DeinitBuildTiles();
|
|||
|
||||
// for global animation
|
||||
bool* flatwarp;
|
||||
byte** warpedflats;
|
||||
BYTE** warpedflats;
|
||||
int* flatwarpedwhen;
|
||||
|
||||
|
||||
|
|
@ -352,7 +352,7 @@ void FTextureManager::LoadHiresTex()
|
|||
char src[9];
|
||||
bool is32bit;
|
||||
int width, height;
|
||||
int type,mode;
|
||||
int type, mode;
|
||||
|
||||
lastLump = 0;
|
||||
src[8] = '\0';
|
||||
|
|
@ -370,7 +370,7 @@ void FTextureManager::LoadHiresTex()
|
|||
if (SC_Compare("wall")) type=FTexture::TEX_Wall, mode=FTextureManager::TEXMAN_Overridable;
|
||||
else if (SC_Compare("flat")) type=FTexture::TEX_Flat, mode=FTextureManager::TEXMAN_Overridable;
|
||||
else if (SC_Compare("sprite")) type=FTexture::TEX_Sprite, mode=0;
|
||||
else type = FTexture::TEX_Any;
|
||||
else type = FTexture::TEX_Any, mode = 0;
|
||||
|
||||
sc_String[8]=0;
|
||||
|
||||
|
|
@ -524,7 +524,7 @@ static struct FakeCmap {
|
|||
} *fakecmaps;
|
||||
size_t numfakecmaps;
|
||||
int firstfakecmap;
|
||||
byte *realcolormaps;
|
||||
BYTE *realcolormaps;
|
||||
int lastusedcolormap;
|
||||
|
||||
void R_SetDefaultColormap (const char *name)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue