mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Use DMG_ defines in code (#1245)

Browse source 
* Use `DMG_` defines for `dmgFlags` when single bits are used

* Pass on several (in code, no colliders)

* Conditional cleanup

* Remove wip comment, just use the flags 4head
This commit is contained in:
Dragorn421 2022-06-03 11:36:04 -07:00 • committed by GitHub
parent b2752a6a2e
commit b3b913d33d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 201 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -320,7 +320,7 @@ void EnDh_Attack(EnDh* this, PlayState* play) {
if (this->skelAnime.curFrame >= 4.0f) {
this->collider2.base.atFlags = this->collider2.elements[0].info.toucherFlags =
AT_ON | AT_TYPE_ENEMY; // also TOUCH_ON | TOUCH_SFX_WOOD
this->collider2.elements[0].info.toucher.dmgFlags = 0xFFCFFFFF;
this->collider2.elements[0].info.toucher.dmgFlags = DMG_DEFAULT;
this->collider2.elements[0].info.toucher.damage = 8;
}
if (this->collider2.base.atFlags & AT_BOUNCED) {
@ -376,7 +376,7 @@ void EnDh_Burrow(EnDh* this, PlayState* play) {
this->drawDirtWave++;
this->collider1.base.atFlags = this->collider1.info.toucherFlags =
AT_ON | AT_TYPE_ENEMY; // also TOUCH_ON | TOUCH_SFX_WOOD
this->collider1.info.toucher.dmgFlags = 0xFFCFFFFF;
this->collider1.info.toucher.dmgFlags = DMG_DEFAULT;
this->collider1.info.toucher.damage = 4;
FALLTHROUGH;
case 1: