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

Fix lowest point check and movement delay 

- This allows separte movement delay for each runner
- Lowest point has to be not in water
scene_man
En Yi 2023-07-20 22:25:57 +08:00
parent a080b5ee0a
commit dc20a6b992
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scenes/engine/EC/EC.h
View File

@ -150,12 +150,14 @@ typedef enum _WaterRunnerState
typedef struct _CWaterRunner { typedef struct _CWaterRunner {
BFSTileMap_t bfs_tilemap; BFSTileMap_t bfs_tilemap;
WaterRunerState_t state;
struct sc_queue_32 bfs_queue;
int32_t start_height; int32_t start_height;
int32_t current_tile; int32_t current_tile;
int32_t target_tile; int32_t target_tile;
struct sc_queue_32 bfs_queue;
bool* visited; bool* visited;
WaterRunerState_t state; uint8_t movement_delay;
uint8_t counter;
}CWaterRunner_t; }CWaterRunner_t;
// Credits to bedroomcoders.co.uk for this // Credits to bedroomcoders.co.uk for this

24
scenes/water_flow.c
View File

@ -21,6 +21,7 @@ Entity_t* create_water_runner(EntityManager_t* ent_manager, int32_t width, int32
p_crunner->bfs_tilemap.width = width; p_crunner->bfs_tilemap.width = width;
p_crunner->bfs_tilemap.height = height; p_crunner->bfs_tilemap.height = height;
p_crunner->bfs_tilemap.len = total; p_crunner->bfs_tilemap.len = total;
p_crunner->movement_delay = 5;
sc_queue_init(&p_crunner->bfs_queue); sc_queue_init(&p_crunner->bfs_queue);
p_crunner->visited = calloc(total, sizeof(bool)); p_crunner->visited = calloc(total, sizeof(bool));
@ -88,7 +89,6 @@ void update_water_runner_system(Scene_t* scene)
continue; continue;
} }
static uint8_t delay = 5;
switch (p_crunner->state) switch (p_crunner->state)
{ {
case LOWEST_POINT_SEARCH: case LOWEST_POINT_SEARCH:
@ -111,18 +111,18 @@ void update_water_runner_system(Scene_t* scene)
unsigned int curr_height = curr_idx / p_crunner->bfs_tilemap.width; unsigned int curr_height = curr_idx / p_crunner->bfs_tilemap.width;
unsigned int curr_low = lowest_tile / p_crunner->bfs_tilemap.width; unsigned int curr_low = lowest_tile / p_crunner->bfs_tilemap.width;
if (curr_height > curr_low)
// Possible optimisation to avoid repeated BFS, dunno how possible
bool to_go[4] = {false, false, false, false};
Tile_t* curr_tile = tilemap.tiles + curr_idx;
if (curr_height > curr_low && curr_tile->water_level < tilemap.max_water_level)
{ {
lowest_tile = curr_idx; lowest_tile = curr_idx;
} }
//p_crunner->visited[curr_idx] = true;
p_crunner->bfs_tilemap.tilemap[curr_idx].reachable = true;
// Possible optimisation to avoid repeated BFS, dunno how possible
bool to_go[4] = {false, false, false, false};
Tile_t* curr_tile = tilemap.tiles + curr_idx;
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 (next < p_crunner->bfs_tilemap.len) if (next < p_crunner->bfs_tilemap.len)
@ -189,13 +189,13 @@ void update_water_runner_system(Scene_t* scene)
prev_idx = curr_idx; prev_idx = curr_idx;
curr_idx = p_crunner->bfs_tilemap.tilemap[prev_idx].from; curr_idx = p_crunner->bfs_tilemap.tilemap[prev_idx].from;
} }
delay = 5; p_crunner->counter = p_crunner->movement_delay;
p_crunner->state = LOWEST_POINT_MOVEMENT; p_crunner->state = LOWEST_POINT_MOVEMENT;
} }
break; break;
case LOWEST_POINT_MOVEMENT: case LOWEST_POINT_MOVEMENT:
delay--; p_crunner->counter--;
if (delay == 0) if (p_crunner->counter == 0)
{ {
p_crunner->current_tile = p_crunner->bfs_tilemap.tilemap[p_crunner->current_tile].to; p_crunner->current_tile = p_crunner->bfs_tilemap.tilemap[p_crunner->current_tile].to;
CTransform_t* p_ct = get_component(ent, CTRANSFORM_COMP_T); CTransform_t* p_ct = get_component(ent, CTRANSFORM_COMP_T);
@ -205,7 +205,7 @@ void update_water_runner_system(Scene_t* scene)
{ {
p_crunner->state = SCANLINE_FILL; p_crunner->state = SCANLINE_FILL;
} }
delay = 5; p_crunner->counter = p_crunner->movement_delay;
} }
break; break;
default: default: