sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Fix runner bug of not reaching water surface 

Also fix bound checking in runner
scene_man
En Yi 2023-07-21 21:19:38 +08:00
parent 6e2ccfa875
commit 89d962d2bc
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scenes/water_flow.c
View File

@ -63,38 +63,36 @@ static void runner_BFS(const TileGrid_t* tilemap, CWaterRunner_t* p_crunner, int
unsigned int next = curr_idx + p_crunner->bfs_tilemap.width; unsigned int next = curr_idx + p_crunner->bfs_tilemap.width;
Tile_t* next_tile = tilemap->tiles + next; Tile_t* next_tile = tilemap->tiles + next;
if (
curr_height > curr_low
&& curr_tile->water_level < tilemap->max_water_level
&& next_tile->water_level < tilemap->max_water_level
)
{
*lowest_tile = curr_idx;
}
if (next < p_crunner->bfs_tilemap.len) if (next < p_crunner->bfs_tilemap.len)
{ {
to_go[0] = next_tile->solid != SOLID; if (
} curr_height > curr_low
&& curr_tile->water_level < tilemap->max_water_level
if ( )
next_tile->solid == SOLID
|| next_tile->water_level == tilemap->max_water_level
|| curr_tile->water_level == tilemap->max_water_level
)
{
if (curr_idx % p_crunner->bfs_tilemap.width != 0)
{ {
next = curr_idx - 1; *lowest_tile = curr_idx;
next_tile = tilemap->tiles + next;
to_go[1] = next_tile->solid != SOLID;
} }
next = curr_idx + 1;
if (next % p_crunner->bfs_tilemap.width != 0) to_go[0] = next_tile->solid != SOLID;
if (
next_tile->solid == SOLID
|| next_tile->water_level == tilemap->max_water_level
|| curr_tile->water_level == tilemap->max_water_level
)
{ {
next_tile = tilemap->tiles + next; if (curr_idx % p_crunner->bfs_tilemap.width != 0)
to_go[2] = next_tile->solid != SOLID; {
next = curr_idx - 1;
next_tile = tilemap->tiles + next;
to_go[1] = next_tile->solid != SOLID;
}
next = curr_idx + 1;
if (next % p_crunner->bfs_tilemap.width != 0)
{
next_tile = tilemap->tiles + next;
to_go[2] = next_tile->solid != SOLID;
}
} }
} }