- 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
|
|
@ -180,12 +180,12 @@ int P_FindLineFromID (int id, int start)
|
|||
//
|
||||
//============================================================================
|
||||
|
||||
BOOL P_ActivateLine (line_t *line, AActor *mo, int side, int activationType)
|
||||
bool P_ActivateLine (line_t *line, AActor *mo, int side, int activationType)
|
||||
{
|
||||
int lineActivation;
|
||||
BOOL repeat;
|
||||
BOOL buttonSuccess;
|
||||
byte special;
|
||||
INTBOOL repeat;
|
||||
INTBOOL buttonSuccess;
|
||||
BYTE special;
|
||||
|
||||
if (!P_TestActivateLine (line, mo, side, activationType))
|
||||
{
|
||||
|
|
@ -249,7 +249,7 @@ BOOL P_ActivateLine (line_t *line, AActor *mo, int side, int activationType)
|
|||
//
|
||||
//============================================================================
|
||||
|
||||
BOOL P_TestActivateLine (line_t *line, AActor *mo, int side, int activationType)
|
||||
bool P_TestActivateLine (line_t *line, AActor *mo, int side, int activationType)
|
||||
{
|
||||
int lineActivation;
|
||||
|
||||
|
|
@ -1589,7 +1589,7 @@ DPusher::DPusher (DPusher::EPusher type, line_t *l, int magnitude, int angle,
|
|||
|
||||
DPusher *tmpusher; // pusher structure for blockmap searches
|
||||
|
||||
BOOL PIT_PushThing (AActor *thing)
|
||||
bool PIT_PushThing (AActor *thing)
|
||||
{
|
||||
if ((thing->flags2 & MF2_WINDTHRUST) && !(thing->flags & MF_NOCLIP))
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue