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

16
src/p_maputl.cpp
View file

@ -550,7 +550,7 @@ sector_t *AActor::LinkToWorldForMapThing ()
num = (SQWORD)(x-ldef->v1->x)*ldef->dx+(SQWORD)(y-ldef->v1->y)*ldef->dy;
if (num >= 0 && num <= den)
{
DPrintf ("%s at (%ld,%ld) lies directly on line %d\n",
DPrintf ("%s at (%d,%d) lies directly on line %d\n",
this->GetClass()->TypeName.GetChars(), x>>FRACBITS, y>>FRACBITS, ldef-lines);
angle_t finean = R_PointToAngle2 (0, 0, ldef->dx, ldef->dy);
if (ldef->backsector != NULL && ldef->backsector == ssec->sector)
@ -635,7 +635,7 @@ void FBlockNode::Release ()
//
extern polyblock_t **PolyBlockMap;
BOOL P_BlockLinesIterator (int x, int y, BOOL(*func)(line_t*))
bool P_BlockLinesIterator (int x, int y, bool(*func)(line_t*))
{
if (x<0 || y<0 || x>=bmapwidth || y>=bmapheight)
{
@ -702,7 +702,7 @@ BOOL P_BlockLinesIterator (int x, int y, BOOL(*func)(line_t*))
// P_BlockThingsIterator
//
BOOL P_BlockThingsIterator (int x, int y, BOOL(*func)(AActor*), TArray<AActor *> &checkarray, AActor *actor)
bool P_BlockThingsIterator (int x, int y, bool(*func)(AActor*), TArray<AActor *> &checkarray, AActor *actor)
{
if ((unsigned int)x >= (unsigned int)bmapwidth ||
(unsigned int)y >= (unsigned int)bmapheight)
@ -765,7 +765,7 @@ BOOL P_BlockThingsIterator (int x, int y, BOOL(*func)(AActor*), TArray<AActor *>
TArray<intercept_t> intercepts (128);
divline_t trace;
BOOL earlyout;
INTBOOL earlyout;
int ptflags;
//
@ -778,7 +778,7 @@ int ptflags;
// are on opposite sides of the trace.
// Returns true if earlyout and a solid line hit.
//
BOOL PIT_AddLineIntercepts (line_t *ld)
bool PIT_AddLineIntercepts (line_t *ld)
{
int s1;
int s2;
@ -834,7 +834,7 @@ BOOL PIT_AddLineIntercepts (line_t *ld)
//
// PIT_AddThingIntercepts
//
BOOL PIT_AddThingIntercepts (AActor* thing)
bool PIT_AddThingIntercepts (AActor* thing)
{
int numfronts = 0;
divline_t line;
@ -925,7 +925,7 @@ BOOL PIT_AddThingIntercepts (AActor* thing)
// Returns true if the traverser function returns true
// for all lines.
//
BOOL P_TraverseIntercepts (traverser_t func, fixed_t maxfrac)
bool P_TraverseIntercepts (traverser_t func, fixed_t maxfrac)
{
unsigned int count;
fixed_t dist;
@ -970,7 +970,7 @@ BOOL P_TraverseIntercepts (traverser_t func, fixed_t maxfrac)
// Returns true if the traverser function returns true
// for all lines.
//
BOOL P_PathTraverse (fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, int flags, BOOL (*trav) (intercept_t *))
bool P_PathTraverse (fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, int flags, bool (*trav) (intercept_t *))
{
static TArray<AActor *> pathbt;