mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-08 20:24:49 -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
include/m_collision_obj.h
+25 -1
View File
@@ -18,7 +18,31 @@ enum collision_type {
ClObj_TYPE_NUM
};
#define ClObj_FLAG_COLLIDED (1 << 1)
#define CollisionCheck_FLAG_SKIP (1 << 0)
#define ClObj_GROUP_PLAYER (1 << 3) // 0x08
#define ClObj_GROUP_2 (1 << 4) // 0x10
#define ClObj_GROUP_3 (1 << 5) // 0x20
#define ClObj_GROUP_ALL (ClObj_GROUP_PLAYER | ClObj_GROUP_2 | ClObj_GROUP_3) // 0x38
#define ClObj_FLAG_CHECK (1 << 0) // 0x01
#define ClObj_FLAG_COLLIDED (1 << 1) // 0x02
#define ClObj_FLAG_DONT_UPDATE_POS (1 << 2) // 0x04
#define ClObj_FLAG_COLLIDE_PLAYER ClObj_GROUP_PLAYER
#define ClObj_FLAG_COLLIDE_GROUP_2 ClObj_GROUP_2
#define ClObj_FLAG_COLLIDE_GROUP_3 ClObj_GROUP_3
#define ClObj_FLAG_COLLISION_PRIORITY (1 << 6)
#define ClObj_FLAG_7 (1 << 7)
#define ClObj_FLAG2_PLAYER_WAS_HIT (1 << 0) // 0x01
#define ClObj_FLAG2_OCC_CHECK (1 << 1) // 0x02
#define ClObj_FLAG2_TRIS_HIT (1 << 2) // 0x04
#define ClObj_FLAG2_IS_PLAYER ClObj_GROUP_PLAYER
#define ClObj_FLAG2_IS_GROUP_2 ClObj_GROUP_2
#define ClObj_FLAG2_IS_GROUP_3 ClObj_GROUP_3
#define ClObjElem_FLAG_CHECK (1 << 0)
#define ClObjElem_FLAG_HIT (1 << 1)
#define ClObj_DID_COLLIDE(obj) ((obj).collision_flags0 & ClObj_FLAG_COLLIDED)