mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Small collision_check improvements (#1172)

Browse source 
* COLSHAPE_INVALID -> COLSHAPE_MAX, variable names

* Marked suggestions

Co-authored-by: mzxrules <mzxrules@gmail.com>

* true/false, SAC_ON define for sacFlags

* SAC_ON -> SAC_ENABLE, intersection -> hitPos, revert ARRAY_COUNT use in CollisionCheck_ApplyDamage

Co-authored-by: mzxrules <mzxrules@gmail.com>
This commit is contained in:
Tharo 2022-03-19 23:33:47 +00:00 committed by GitHub
parent b2a3fb2f7f
commit a7fa906841
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 468 additions and 468 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/z64collision_check.h
View file

@ -252,7 +252,7 @@ typedef enum {
/* 1 */ COLSHAPE_CYLINDER, /* 1 */ COLSHAPE_CYLINDER,
/* 2 */ COLSHAPE_TRIS, /* 2 */ COLSHAPE_TRIS,
/* 3 */ COLSHAPE_QUAD, /* 3 */ COLSHAPE_QUAD,
/* 4 */ COLSHAPE_INVALID /* 4 */ COLSHAPE_MAX
} ColliderShape; } ColliderShape;
/** /**
@ -272,6 +272,8 @@ typedef enum {
/* 7 */ ELEMTYPE_UNK7 /* 7 */ ELEMTYPE_UNK7
} ElementType; } ElementType;
#define SAC_ENABLE (1 << 0)
#define AT_NONE 0 // No flags set. Cannot have AT collisions when set as AT #define AT_NONE 0 // No flags set. Cannot have AT collisions when set as AT
#define AT_ON (1 << 0) // Can have AT collisions when set as AT #define AT_ON (1 << 0) // Can have AT collisions when set as AT
#define AT_HIT (1 << 1) // Had an AT collision #define AT_HIT (1 << 1) // Had an AT collision

932
src/code/z_collision_check.c
View file

File diff suppressed because it is too large Load diff