williamjcm/raycastlib
1
0
Fork 0
mirror of https://git.coom.tech/drummyfish/raycastlib.git synced 2024-11-21 20:29:59 +01:00
Code Activity

Make C again

Browse source
This commit is contained in:
Miloslav Číž 2018-09-11 15:29:58 +02:00
parent 5fbebe3af7
commit 1f6237c95e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
raycastlib.h
View file

@ -1202,12 +1202,12 @@ void moveCameraWithCollision(Camera *camera, Vector2D planeOffset,
{\ {\
Unit height = floorHeightFunc(s1,s2);\ Unit height = floorHeightFunc(s1,s2);\
if (height > bottomLimit)\ if (height > bottomLimit)\
dir##Collides = true;\ dir##Collides = 0;\
else if (ceilingHeightFunc != 0)\ else if (ceilingHeightFunc != 0)\
{\ {\
height = ceilingHeightFunc(s1,s2);\ height = ceilingHeightFunc(s1,s2);\
if (height < topLimit)\ if (height < topLimit)\
dir##Collides = true;\ dir##Collides = 0;\
}\ }\
}\ }\
else\ else\
@ -1230,10 +1230,10 @@ void moveCameraWithCollision(Camera *camera, Vector2D planeOffset,
}\ }\
} }
int8_t xCollides = false; int8_t xCollides = 0;
collCheckOrtho(x,y,xSquareNew,ySquare,1) collCheckOrtho(x,y,xSquareNew,ySquare,1)
int8_t yCollides = false; int8_t yCollides = 0;
collCheckOrtho(y,x,xSquare,ySquareNew,0) collCheckOrtho(y,x,xSquare,ySquareNew,0)
#define collHandle(dir)\ #define collHandle(dir)\
@ -1246,7 +1246,7 @@ void moveCameraWithCollision(Camera *camera, Vector2D planeOffset,
{ {
if (xSquare != xSquareNew && ySquare != ySquareNew) // corner? if (xSquare != xSquareNew && ySquare != ySquareNew) // corner?
{ {
int8_t xyCollides = false; int8_t xyCollides = 0;
collCheck(xy,xSquareNew,ySquareNew) collCheck(xy,xSquareNew,ySquareNew)
if (xyCollides) if (xyCollides)