zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 15:02:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #385 from alexey-lysiuk/compat_pointonline2

Browse source 
PointOnLine compatibility settings
This commit is contained in:
coelckers 2015-09-15 21:36:53 +02:00
commit 011a71b7e5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_local.h
View file

@ -242,7 +242,7 @@ inline int P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line)
{ {
extern int P_VanillaPointOnLineSide(fixed_t x, fixed_t y, const line_t* line); extern int P_VanillaPointOnLineSide(fixed_t x, fixed_t y, const line_t* line);
return compatflags2 & COMPATF2_POINTONLINE return i_compatflags2 & COMPATF2_POINTONLINE
? P_VanillaPointOnLineSide(x, y, line) ? P_VanillaPointOnLineSide(x, y, line)
: DMulScale32 (y-line->v1->y, line->dx, line->v1->x-x, line->dy) > 0; : DMulScale32 (y-line->v1->y, line->dx, line->v1->x-x, line->dy) > 0;
} }
@ -260,7 +260,7 @@ inline int P_PointOnDivlineSide (fixed_t x, fixed_t y, const divline_t *line)
{ {
extern int P_VanillaPointOnDivlineSide(fixed_t x, fixed_t y, const divline_t* line); extern int P_VanillaPointOnDivlineSide(fixed_t x, fixed_t y, const divline_t* line);
return (compatflags2 & COMPATF2_POINTONLINE) return (i_compatflags2 & COMPATF2_POINTONLINE)
? P_VanillaPointOnDivlineSide(x, y, line) ? P_VanillaPointOnDivlineSide(x, y, line)
: (DMulScale32 (y-line->y, line->dx, line->x-x, line->dy) > 0); : (DMulScale32 (y-line->y, line->dx, line->x-x, line->dy) > 0);
} }

8
wadsrc/static/compatibility.txt
View file

@ -320,8 +320,7 @@ F481922F4881F74760F3C0437FD5EDD0 // map03
7C1913DEE396BA26CFF22A0E9369B7D2 // Nuke Mine, e1m2 7C1913DEE396BA26CFF22A0E9369B7D2 // Nuke Mine, e1m2
{ {
clearlinespecial 1107 pointonline
clearlinespecial 1108
} }
5B862477519B21B30059A466F2FF6460 // Khorus, map08 5B862477519B21B30059A466F2FF6460 // Khorus, map08
@ -401,3 +400,8 @@ D0139194F7817BF06F3988DFC47DB38D // Whispers of Satan map29
{ {
nopassover nopassover
} }
D7F6E9F08C39A17026349A04F8C0B0BE // Return to Hadron, e1m9
{
pointonline
}