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

Various bug fixes for grid system.

This commit is contained in:
Steve 2015-11-02 12:03:47 +00:00
parent 64a461e29c
commit 62a445ac61
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/battle/grid.c
View File

@ -37,18 +37,21 @@ void addToGrid(Entity *e)
{
for (y = y1 ; y <= y2 ; y++)
{
prev = &battle.grid[x][y];
for (cell = battle.grid[x][y].next ; cell != NULL ; cell = cell->next)
if (x >= 0 && y >= 0 && x < GRID_SIZE && y < GRID_SIZE)
{
prev = cell;
prev = &battle.grid[x][y];
for (cell = battle.grid[x][y].next ; cell != NULL ; cell = cell->next)
{
prev = cell;
}
cell = malloc(sizeof(GridCell));
memset(cell, 0, sizeof(GridCell));
prev->next = cell;
cell->entity = e;
}
cell = malloc(sizeof(GridCell));
memset(cell, 0, sizeof(GridCell));
prev->next = cell;
cell->entity = e;
}
}
}
@ -67,18 +70,21 @@ void removeFromGrid(Entity *e)
{
for (y = y1 ; y <= y2 ; y++)
{
prev = &battle.grid[x][y];
for (cell = battle.grid[x][y].next ; cell != NULL ; cell = cell->next)
if (x >= 0 && y >= 0 && x < GRID_SIZE && y < GRID_SIZE)
{
if (cell->entity == e)
{
prev->next = cell->next;
free(cell);
cell = prev;
}
prev = &battle.grid[x][y];
prev = cell;
for (cell = battle.grid[x][y].next ; cell != NULL ; cell = cell->next)
{
if (cell->entity == e)
{
prev->next = cell->next;
free(cell);
cell = prev;
}
prev = cell;
}
}
}
}
@ -93,16 +99,22 @@ Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore)
x1 = x / GRID_CELL_WIDTH;
y1 = y / GRID_CELL_HEIGHT;
x2 = w / GRID_CELL_WIDTH;
y2 = h / GRID_CELL_HEIGHT;
x2 = (x + w) / GRID_CELL_WIDTH;
y2 = (y + h) / GRID_CELL_HEIGHT;
for (x = x1 ; x < x2 ; x++)
for (x = x1 ; x <= x2 ; x++)
{
for (y = y1 ; y < y2 ; y++)
for (y = y1 ; y <= y2 ; y++)
{
for (cell = battle.grid[x][y].next ; cell != NULL ; cell = cell->next)
if (x >= 0 && y >= 0 && x < GRID_SIZE && y < GRID_SIZE)
{
addCandidate(battle.grid[x][y].entity);
for (cell = battle.grid[x][y].next ; cell != NULL ; cell = cell->next)
{
if (cell->entity != ignore)
{
addCandidate(cell->entity);
}
}
}
}
}