- 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
|
|
@ -105,7 +105,7 @@ static FRandom pr_classchoice ("RandomPlayerClassChoice");
|
|||
|
||||
TArray<EndSequence> EndSequences;
|
||||
|
||||
extern int timingdemo;
|
||||
extern bool timingdemo;
|
||||
|
||||
// Start time for timing demos
|
||||
int starttime;
|
||||
|
|
@ -742,9 +742,9 @@ static void ParseMapInfoLower (MapInfoHandler *handlers,
|
|||
{
|
||||
int entry;
|
||||
MapInfoHandler *handler;
|
||||
byte *info;
|
||||
BYTE *info;
|
||||
|
||||
info = levelinfo ? (byte *)levelinfo : (byte *)clusterinfo;
|
||||
info = levelinfo ? (BYTE *)levelinfo : (BYTE *)clusterinfo;
|
||||
|
||||
while (SC_GetString ())
|
||||
{
|
||||
|
|
@ -1557,9 +1557,9 @@ void G_InitNew (char *mapname, bool bTitleLevel)
|
|||
//
|
||||
// G_DoCompleted
|
||||
//
|
||||
BOOL secretexit;
|
||||
bool secretexit;
|
||||
static int startpos; // [RH] Support for multiple starts per level
|
||||
extern BOOL NoWipe; // [RH] Don't wipe when travelling in hubs
|
||||
extern int NoWipe; // [RH] Don't wipe when travelling in hubs
|
||||
static bool startkeepfacing; // [RH] Support for keeping your facing angle
|
||||
static bool resetinventory; // Reset the inventory to the player's default for the next level
|
||||
|
||||
|
|
@ -1917,7 +1917,7 @@ void G_DoLoadLevel (int position, bool autosave)
|
|||
|
||||
if (timingdemo)
|
||||
{
|
||||
static BOOL firstTime = true;
|
||||
static bool firstTime = true;
|
||||
|
||||
if (firstTime)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue