mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-10 12:05:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc 13 (#1244)

Browse Source 
* Squared variables fixup

* `sAnimSoundFrames` fixup

* `ocElemFlags` fixup

* `toucherFlags` fixup

* `bumperFlags` fixup

* `atFlags` fixup

* `acFlags` fixup

* `ocFlags1` fixup

* `ocFlags2` fixup

* `&=`

* `TOUCH_SFX_NONE` -> `_MASK` in `CollisionCheck_HitSolid`
This commit is contained in:
Dragorn421
2022-05-31 11:48:41 -07:00
committed by GitHub
parent d6a7d43735
commit fa1ea37d54
35 changed files with 126 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_collision_check.c
+1 -1
View File
@@ -1559,7 +1559,7 @@ void CollisionCheck_RedBloodUnused(PlayState* play, Collider* collider, Vec3f* v
* Plays sound effects and displays hitmarks for solid-type AC colliders (METAL, WOOD, HARD, and TREE)
*/
void CollisionCheck_HitSolid(PlayState* play, ColliderInfo* info, Collider* collider, Vec3f* hitPos) {
s32 flags = info->toucherFlags & TOUCH_SFX_NONE;
s32 flags = info->toucherFlags & TOUCH_SFX_MASK;
if (flags == TOUCH_SFX_NORMAL && collider->colType != COLTYPE_METAL) {
EffectSsHitMark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, hitPos);