TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix name conflict 'FSCALE' on Mac OS X

Browse source
This commit is contained in:
kreatordxx 2008-01-24 10:34:31 +00:00
parent d9e23370f9
commit deba7709ce
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
2d/clip.h
View file

@ -37,6 +37,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#ifndef _CLIP_H
#define _CLIP_H
/*#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
@ -60,7 +62,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
# define USCALE(var,arg,num,den) \
((var) = ((unsigned)(arg) * (unsigned)(num)) / (unsigned)(den))
# define FSCALE(var,arg,num,den) ((var) = fixmuldiv((arg),(num),(den)))
# define FIXSCALE(var,arg,num,den) ((var) = fixmuldiv((arg),(num),(den)))
#define CLIPDOT(xx,yy,WHEN_OUTSIDE,WHEN_CLIPPED) { \
if((xx > XMAX) || (xx < XMIN)) { WHEN_OUTSIDE; } \
@ -159,3 +161,5 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
} \
} \
} while(0)
#endif

2
2d/line.c
View file

@ -358,7 +358,7 @@ int gr_line(fix a1, fix b1, fix a2, fix b2)
x2 = i2f(MAXX);
y2 = i2f(MAXY);
CLIPLINE(a1,b1,a2,b2,x1,y1,x2,y2,return 2,clipped=1, FSCALE );
CLIPLINE(a1,b1,a2,b2,x1,y1,x2,y2,return 2,clipped=1, FIXSCALE );
gr_uline( a1, b1, a2, b2 );

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20080123
--------
d1x.ini, INSTALL.txt, SConstruct, 2d/font.c, 2d/canvas.c, 2d/bitmap.c, 2d/rle.c, 2d/pcx.c, arch/linux/hmiplay.c, arch/ogl/ogl.c, arch/ogl/gr.c, arch/sdl/digi_mixer_music.c, arch/sdl/joy.c, arch/sdl/include/digi_mixer_music.h, arch/sdl/jukebox.c, arch/sdl/gr.c, arch/win32/hmpfile.c, editor/macro.c, editor/medsel.c, editor/med.c, editor/autosave.c, iff/iff.c, include/args.h, include/hmp2mid.h, include/pstypes.h, include/ignorecase.h, include/cfile.h, include/error.h, include/strio.h, include/u_mem.h, include/physfsx.h, main/gameseg.c, main/custom.c, main/newmenu.c, main/fvi.c, main/text.c, main/network.c, main/text.h, main/multi.c, main/multi.h, main/inferno.c, main/gamefont.c, main/menu.c, main/inferno.h, main/playsave.c, main/titles.c, main/titles.h, main/bmread.c, main/piggy.c, main/render.c, main/state.c, main/gamesave.c, main/newdemo.c, main/config.c, main/gameseq.c, main/hash.c, main/gameseq.h, main/altsound.c, main/ai.c, main/scores.c, main/endlevel.c, main/terrain.c, main/polyobj.c, main/game.c, main/mission.c, main/mission.h, main/credits.c, mem/mem.c, misc/ignorecase.c, misc/hmp2mid.c, misc/strio.c, misc/error.c, misc/dl_list.c, misc/args.c, ui/radio.c, ui/menu.c, ui/window.c, ui/inputbox.c, ui/keypad.c, ui/file.c, ui/checkbox.c, ui/menubar.c, ui/lfile.c, ui/gadget.c: Implemented PhysFS support; Implemended D2X memory functions; Code cleanups
2d/clip.h, 2d/line.c: fix name conflict 'FSCALE' on Mac OS X
20080113
--------