mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-31 08:12:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add flags for collision object/collision check

Browse Source
This commit is contained in:
Cuyler36
2025-06-10 23:12:22 -04:00
parent 623abef0c3
commit f13e592af9
6 changed files with 213 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/m_collision_obj.c
+181 -390
View File
File diff suppressed because it is too large Load Diff
src/game/m_player_common.c_inc
+2 -2
View File
@@ -2045,14 +2045,14 @@ static int Player_actor_Check_OBJtoLine_forItem_axe(ACTOR* actorx) {
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actorx;
ClObjTris_c* axe_tris_p = &player->item_axe_tris;
return axe_tris_p->collision_obj.collision_flags1 & (1 << 2);
return axe_tris_p->collision_obj.collision_flags1 & ClObj_FLAG2_TRIS_HIT;
}
static int Player_actor_Check_OBJtoLine_forItem_net(ACTOR* actorx, ACTOR** hit_actor) {
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actorx;
ClObjTris_c* net_tris_p = &player->item_net_tris;
if ((net_tris_p->collision_obj.collision_flags1 & (1 << 2)) == 0) {
if ((net_tris_p->collision_obj.collision_flags1 & ClObj_FLAG2_TRIS_HIT) == 0) {
*hit_actor = NULL;
return FALSE;
} else {