mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 06:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Colliders Sync Tris Quad Sphere Line (#1714)

Browse Source 
* Tris

* Quad

* Sphere

* Line
This commit is contained in:
Derek Hensley
2024-10-16 06:51:16 -07:00
committed by GitHub
parent 5dd4310285
commit 1ddc836c8e
22 changed files with 581 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+4 -4
View File
@@ -4809,11 +4809,11 @@ void func_800BE504(Actor* actor, ColliderCylinder* cyl) {
}
}
void func_800BE568(Actor* actor, ColliderSphere* collider) {
if (collider->info.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20)) {
actor->world.rot.y = collider->base.ac->shape.rot.y;
void func_800BE568(Actor* actor, ColliderSphere* sph) {
if (sph->elem.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20)) {
actor->world.rot.y = sph->base.ac->shape.rot.y;
} else {
actor->world.rot.y = Actor_WorldYawTowardActor(collider->base.ac, actor);
actor->world.rot.y = Actor_WorldYawTowardActor(sph->base.ac, actor);
}
}
src/code/z_collision_check.c
+427 -422
View File
File diff suppressed because it is too large Load Diff
src/code/z_fireobj.c
+1 -1
View File
@@ -229,7 +229,7 @@ void FireObj_Update(PlayState* play, FireObj* fire, Actor* actor) {
} else if ((fire->collision.base.acFlags & AC_HIT) && (arrow->actor.update != NULL) &&
(arrow->actor.id == ACTOR_EN_ARROW)) {
arrow->actor.params = 0;
arrow->collider.info.toucher.dmgFlags = DMG_FIRE_ARROW;
arrow->collider.elem.toucher.dmgFlags = DMG_FIRE_ARROW;
}
fire->collision.dim.pos.x = fire->position.x;
fire->collision.dim.pos.y = fire->position.y;