mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-09 11:44:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

General Cleanup 2 (#681)

Browse Source 
* cleanup

* Clean up toto

* More ClockTime macro

* rename pad

* EnGo and format

* EntityLineTest booleans

* Other bgcheck tests

* Graph Allocs

* Lib_Segmented

* Fix toto comment

* Remove macro comment for EnBigpo_DrawLantern

* Format and remove sym from undefined_syms.txt

* PR suggestions

* BgIkanaRay params

* One day i'll remember

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Derek Hensley
2022-03-05 07:03:20 -08:00
committed by GitHub
parent 7fcefd8d3f
commit 1e4411a871
63 changed files with 252 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+2 -1
View File
@@ -3405,7 +3405,8 @@ void func_800BB604(GameState* gameState, ActorContext* actorCtx, Player* player,
if (((phi_s2) || (phi_s2_2)) && (func_800B83BC(actor, temp_f0_2))) {
if (func_800BB59C(globalCtx, actor)) {
if (((!BgCheck_CameraLineTest1(&globalCtx->colCtx, &player->actor.focus.pos,
&actor->focus.pos, &sp70, &sp80, 1, 1, 1, 1, &sp7C)) ||
&actor->focus.pos, &sp70, &sp80, true, true, true, true,
&sp7C)) ||
(SurfaceType_IsIgnoredByProjectiles(&globalCtx->colCtx, sp80, sp7C)))) {
if (actor->targetPriority != 0) {
if ((phi_s2 != 0) && (actor->targetPriority < D_801ED8D4)) {