walkero
/
blobwarsAttrition
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Trace line to/from centre of objects.

This commit is contained in:
Steve 2018-02-09 22:33:38 +00:00
parent a6a3cbd6a6
commit 31d55d6954
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/combat/combat.c
View File

@ -31,12 +31,17 @@ int hasLineOfSight(Entity *src, Entity *dest)
static int isBlockedByMap(Entity *src, Entity *dest) static int isBlockedByMap(Entity *src, Entity *dest)
{ {
SDL_Rect mapBlock; SDL_Rect mapBlock;
int x, y, x1, y1, x2, y2, mx, my; int x, y, x1, y1, x2, y2, mx, my, sx, sy, tx, ty;
x1 = (int) MIN(src->x, dest->x); x1 = (int) MIN(src->x, dest->x);
y1 = (int) MIN(src->y, dest->y); y1 = (int) MIN(src->y, dest->y);
x2 = (int) MAX(src->x, dest->x); x2 = (int) MAX(src->x, dest->x);
y2 = (int) MAX(src->y, dest->y); y2 = (int) MAX(src->y, dest->y);
sx = src->x + (src->w / 2);
sy = src->y + (src->h / 2);
tx = dest->x + (dest->w / 2);
ty = dest->y + (dest->h / 2);
for (x = x1; x <= x2; x++) for (x = x1; x <= x2; x++)
{ {
@ -52,7 +57,7 @@ static int isBlockedByMap(Entity *src, Entity *dest)
mapBlock.w = MAP_TILE_SIZE; mapBlock.w = MAP_TILE_SIZE;
mapBlock.h = MAP_TILE_SIZE; mapBlock.h = MAP_TILE_SIZE;
if (lineRectIntersection(src->x, src->y, dest->x, dest->y, &mapBlock)) if (lineRectIntersection(sx, sy, tx, ty, &mapBlock))
{ {
return 1; return 1;
} }
@ -67,13 +72,18 @@ static int isBlockedByEntities(Entity *src, Entity *dest)
{ {
Entity **candidates, *e; Entity **candidates, *e;
SDL_Rect losBounds, eBounds; SDL_Rect losBounds, eBounds;
int i; int i, sx, sy, tx, ty;
losBounds.x = (int) MIN(src->x, dest->x); losBounds.x = (int) MIN(src->x, dest->x);
losBounds.y = (int) MIN(src->y, dest->y); losBounds.y = (int) MIN(src->y, dest->y);
losBounds.w = (int) (MAX(src->x, dest->x) - losBounds.x); losBounds.w = (int) (MAX(src->x, dest->x) - losBounds.x);
losBounds.h = (int) (MAX(src->y, dest->y) - losBounds.y); losBounds.h = (int) (MAX(src->y, dest->y) - losBounds.y);
sx = src->x + (src->w / 2);
sy = src->y + (src->h / 2);
tx = dest->x + (dest->w / 2);
ty = dest->y + (dest->h / 2);
candidates = getAllEntsWithin(losBounds.x, losBounds.y, losBounds.w, losBounds.h, NULL); candidates = getAllEntsWithin(losBounds.x, losBounds.y, losBounds.w, losBounds.h, NULL);
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i]) for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
@ -88,7 +98,7 @@ static int isBlockedByEntities(Entity *src, Entity *dest)
eBounds.w = e->w; eBounds.w = e->w;
eBounds.h = e->h; eBounds.h = e->h;
if (lineRectIntersection(src->x, src->y, dest->x, dest->y, &eBounds)) if (lineRectIntersection(sx, sy, tx, ty, &eBounds))
{ {
return 1; return 1;
} }