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

Prevent crush by wooden crates 

Changelog:
- collision check return status for:
    0 - no collision
    1 - non-fragile collision
    2 - fragile collision
- Update crushing function
scene_man
En Yi 2023-06-05 22:21:48 +08:00
parent 57cb3ef07a
commit bab18dd5e9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scenes/game_systems.c
View File

@ -43,14 +43,16 @@ typedef struct CollideEntity {
// ------------------------- Collision functions ------------------------------------ // ------------------------- Collision functions ------------------------------------
// Do not subtract one for the size for any collision check, just pass normally. The extra one is important for AABB test // Do not subtract one for the size for any collision check, just pass normally. The extra one is important for AABB test
static bool check_collision(const CollideEntity_t* ent, TileGrid_t* grid, bool check_oneway) static uint8_t check_collision(const CollideEntity_t* ent, TileGrid_t* grid, bool check_oneway)
{ {
for(unsigned int tile_y = ent->area.tile_y1; tile_y <= ent->area.tile_y2; tile_y++) for(unsigned int tile_y = ent->area.tile_y1; tile_y <= ent->area.tile_y2; tile_y++)
{ {
if (tile_y >= grid->height) return 0;
for(unsigned int tile_x = ent->area.tile_x1; tile_x <= ent->area.tile_x2; tile_x++) for(unsigned int tile_x = ent->area.tile_x1; tile_x <= ent->area.tile_x2; tile_x++)
{ {
if (tile_x >= grid->width) return 0;
unsigned int tile_idx = tile_y*grid->width + tile_x; unsigned int tile_idx = tile_y*grid->width + tile_x;
if (grid->tiles[tile_idx].solid == SOLID) return true; if (grid->tiles[tile_idx].solid == SOLID) return 1;
Vector2 overlap; Vector2 overlap;
if (check_oneway && grid->tiles[tile_idx].solid == ONE_WAY) if (check_oneway && grid->tiles[tile_idx].solid == ONE_WAY)
@ -62,7 +64,7 @@ static bool check_collision(const CollideEntity_t* ent, TileGrid_t* grid, bool c
); );
//For one-way platform, check for vectical collision, only return true for up direction //For one-way platform, check for vectical collision, only return true for up direction
if (overlap.y != 0 && ent->prev_bbox.y + ent->prev_bbox.height - 1 < tile_y * TILE_SIZE) return true; if (overlap.y != 0 && ent->prev_bbox.y + ent->prev_bbox.height - 1 < tile_y * TILE_SIZE) return 1;
} }
Entity_t* p_other_ent; Entity_t* p_other_ent;
@ -84,13 +86,13 @@ static bool check_collision(const CollideEntity_t* ent, TileGrid_t* grid, bool c
) )
) )
{ {
return true; return (p_bbox->fragile) ? 2 : 1;
} }
} }
} }
} }
} }
return false; return 0;
} }
// TODO: This should be a point collision check, not an AABB check // TODO: This should be a point collision check, not an AABB check
@ -619,7 +621,7 @@ void player_crushing_system(Scene_t* scene)
.tile_y2 = (p_ctransform->position.y + p_bbox->size.y - 1) / TILE_SIZE, .tile_y2 = (p_ctransform->position.y + p_bbox->size.y - 1) / TILE_SIZE,
}, },
}; };
if (check_collision(&ent, &tilemap, false)) if (check_collision(&ent, &tilemap, false) == 1)
{ {
memset(&p_ctransform->position, 0, sizeof(p_ctransform->position)); memset(&p_ctransform->position, 0, sizeof(p_ctransform->position));
memset(&p_ctransform->velocity, 0, sizeof(p_ctransform->velocity)); memset(&p_ctransform->velocity, 0, sizeof(p_ctransform->velocity));
@ -1189,7 +1191,6 @@ void state_transition_update_system(Scene_t* scene)
p_ctransform->position.y + p_bbox->half_size.y, p_ctransform->position.y + p_bbox->half_size.y,
data->tilemap.width data->tilemap.width
); );
in_water = (data->tilemap.tiles[tile_idx].water_level > 0); in_water = (data->tilemap.tiles[tile_idx].water_level > 0);
} }
else else