View | Details | Raw Unified
Collapse All | Expand All

(-) lsdldoom-1.4.4.4.orig1/src/d_deh.c (-1 / +1 lines)
 Lines 965-971    Link Here 
// Prototypes for block processing functions
// Prototypes for block processing functions
// Pointers to these functions are used as the blocks are encountered.
// Pointers to these functions are used as the blocks are encountered.
void deh_procThing(DEHFILE *, FILE*, char *);
static void deh_procThing(DEHFILE *fpin, FILE* fpout, char *line);
void deh_procFrame(DEHFILE *, FILE*, char *);
void deh_procFrame(DEHFILE *, FILE*, char *);
void deh_procPointer(DEHFILE *, FILE*, char *);
void deh_procPointer(DEHFILE *, FILE*, char *);
void deh_procSounds(DEHFILE *, FILE*, char *);
void deh_procSounds(DEHFILE *, FILE*, char *);
(-) lsdldoom-1.4.4.4.orig1/src/doomtype.h (+6 lines)
 Lines 47-52    Link Here 
typedef signed long long int_64_t; 
typedef signed long long int_64_t; 
typedef unsigned long long uint_64_t; 
typedef unsigned long long uint_64_t; 
#ifdef __GNUC__
#define CONSTFUNC __attribute__((const))
#else
#define CONSTFUNC
#endif
/* CPhipps - use limits.h instead of depreciated values.h */
/* CPhipps - use limits.h instead of depreciated values.h */
#include <limits.h>
#include <limits.h>
#endif
#endif
(-) lsdldoom-1.4.4.4.orig1/src/drawcol.S (-4 / +4 lines)
 Lines 41-47    Link Here 
 .text
 .text
 .align 8
 .align 8
 .globl R_DrawColumn_Normal
// .globl R_DrawColumn_Normal
R_DrawColumn_Normal:
R_DrawColumn_Normal:
 pushl %ebp
 pushl %ebp
 Lines 196-202    Link Here 
//================
//================
 .align 8
 .align 8
 .globl R_DrawTLColumn_Normal
// .globl R_DrawTLColumn_Normal
R_DrawTLColumn_Normal:
R_DrawTLColumn_Normal:
 pushl %ebp
 pushl %ebp
 Lines 386-392    Link Here 
 ret
 ret
 .align 8
 .align 8
 .globl R_DrawColumn_HighRes
// .globl R_DrawColumn_HighRes
R_DrawColumn_HighRes:
R_DrawColumn_HighRes:
 pushl %ebp
 pushl %ebp
 Lines 540-546    Link Here 
//================
//================
 .align 8
 .align 8
 .globl R_DrawTLColumn_HighRes
// .globl R_DrawTLColumn_HighRes
R_DrawTLColumn_HighRes:
R_DrawTLColumn_HighRes:
 pushl %ebp
 pushl %ebp
(-) lsdldoom-1.4.4.4.orig1/src/drawspan.S (-1 / +1 lines)
 Lines 44-50    Link Here 
.text
.text
.align 8
.align 8
.globl R_DrawSpan
//.globl R_DrawSpan
R_DrawSpan:
R_DrawSpan:
 pushl %ebp
 pushl %ebp
(-) lsdldoom-1.4.4.4.orig1/src/m_fixed.h (-4 / +4 lines)
 Lines 63-69    Link Here 
/* killough 5/10/98: In djgpp, use inlined assembly for performance
/* killough 5/10/98: In djgpp, use inlined assembly for performance
 * CPhipps - made __inline__ to inline, as specified in the gcc docs
 * CPhipps - made __inline__ to inline, as specified in the gcc docs
 * Also made const */
 * Also made const */
inline static const fixed_t FixedMul(fixed_t a, fixed_t b)
inline static CONSTFUNC fixed_t FixedMul(fixed_t a, fixed_t b)
{
{
  fixed_t result;
  fixed_t result;
  int dummy;
  int dummy;
 Lines 103-109    Link Here 
 * killough 9/5/98: optimized to reduce the number of branches
 * killough 9/5/98: optimized to reduce the number of branches
 * CPhipps - made __inline__ to inline, as specified in the gcc docs
 * CPhipps - made __inline__ to inline, as specified in the gcc docs
 * Also made const */
 * Also made const */
inline static const fixed_t FixedDiv(fixed_t a, fixed_t b)
inline static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b)
{
{
  if (abs(a) >> 14 < abs(b))
  if (abs(a) >> 14 < abs(b))
    {
    {
 Lines 126-132    Link Here 
#else /* I386_ASM */
#else /* I386_ASM */
/* CPhipps - made __inline__ to inline, as specified in the gcc docs
/* CPhipps - made __inline__ to inline, as specified in the gcc docs
 * Also made const */
 * Also made const */
inline static const fixed_t FixedDiv(fixed_t a, fixed_t b)
inline static CONSTFUNC fixed_t FixedDiv(fixed_t a, fixed_t b)
{
{
  return (abs(a)>>14) >= abs(b) ? ((a^b)>>31) ^ INT_MAX :
  return (abs(a)>>14) >= abs(b) ? ((a^b)>>31) ^ INT_MAX :
    (fixed_t)(((int_64_t) a << FRACBITS) / b);
    (fixed_t)(((int_64_t) a << FRACBITS) / b);
 Lines 138-144    Link Here 
 * FixedMod - returns a % b, guaranteeing 0<=a<b
 * FixedMod - returns a % b, guaranteeing 0<=a<b
 * (notice that the C standard for % does not guarantee this)
 * (notice that the C standard for % does not guarantee this)
 */
 */
inline static const fixed_t FixedMod(fixed_t a, fixed_t b)
inline static CONSTFUNC fixed_t FixedMod(fixed_t a, fixed_t b)
{
{
  if (b & (b-1)) {
  if (b & (b-1)) {
    fixed_t r = a % b;
    fixed_t r = a % b;
(-) lsdldoom-1.4.4.4.orig1/src/p_maputl.h (-6 lines)
 Lines 63-74    Link Here 
typedef boolean (*traverser_t)(intercept_t *in);
typedef boolean (*traverser_t)(intercept_t *in);
#ifdef __GNUC__
#define CONSTFUNC const
#else
#define CONSTFUNC
#endif
fixed_t CONSTFUNC P_AproxDistance (fixed_t dx, fixed_t dy);
fixed_t CONSTFUNC P_AproxDistance (fixed_t dx, fixed_t dy);
int     CONSTFUNC P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line);
int     CONSTFUNC P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line);
int     CONSTFUNC P_PointOnDivlineSide (fixed_t x, fixed_t y, 
int     CONSTFUNC P_PointOnDivlineSide (fixed_t x, fixed_t y, 
(-) lsdldoom-1.4.4.4.orig1/src/r_bsp.h (-5 lines)
 Lines 41-51    Link Here 
extern line_t   *linedef;
extern line_t   *linedef;
extern sector_t *frontsector;
extern sector_t *frontsector;
extern sector_t *backsector;
extern sector_t *backsector;
extern int      rw_x;
extern int      rw_stopx;
extern boolean  segtextured;
extern boolean  markfloor;      /* false if the back side is the same plane */
extern boolean  markceiling;
/* old code -- killough:
/* old code -- killough:
 * extern drawseg_t drawsegs[MAXDRAWSEGS];
 * extern drawseg_t drawsegs[MAXDRAWSEGS];
(-) lsdldoom-1.4.4.4.orig1/src/r_draw.c (+1 lines)
 Lines 383-388    Link Here 
      }
      }
    else
    else
      {
      {
	if (heightmask == -1 && frac < 0) frac = 0;
        while ((count-=2)>=0)   // texture height is a power of 2 -- killough
        while ((count-=2)>=0)   // texture height is a power of 2 -- killough
          {
          {
            *dest = tranmap[(*dest<<8)+colormap[source[(frac>>FRACBITS) & heightmask]]]; // phares
            *dest = tranmap[(*dest<<8)+colormap[source[(frac>>FRACBITS) & heightmask]]]; // phares
(-) lsdldoom-1.4.4.4.orig1/src/r_main.c (-2 / +2 lines)
 Lines 116-122    Link Here 
// killough 5/2/98: reformatted
// killough 5/2/98: reformatted
//
//
const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node)
CONSTFUNC int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node)
{
{
  if (!node->dx)
  if (!node->dx)
    return x <= node->x ? node->dy > 0 : node->dy < 0;
    return x <= node->x ? node->dy > 0 : node->dy < 0;
 Lines 135-141    Link Here 
// killough 5/2/98: reformatted
// killough 5/2/98: reformatted
const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line)
CONSTFUNC int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line)
{
{
  fixed_t lx = line->v1->x;
  fixed_t lx = line->v1->x;
  fixed_t ly = line->v1->y;
  fixed_t ly = line->v1->y;
(-) lsdldoom-1.4.4.4.orig1/src/r_main.h (-2 / +2 lines)
 Lines 108-115    Link Here 
// Utility functions.
// Utility functions.
//
//
const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node);
CONSTFUNC int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node);
const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line);
CONSTFUNC int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line);
angle_t R_PointToAngle(fixed_t x, fixed_t y);
angle_t R_PointToAngle(fixed_t x, fixed_t y);
angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);