diff options
| author | EllipticEllipsis <elliptic.ellipsis@gmail.com> | 2022-12-08 19:33:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-08 16:33:21 -0300 |
| commit | bbbe0b1821febc653233c48e47fd492f95e5bc0d (patch) | |
| tree | e94dfcc6055e78e25085b54f9246277772a9216c /src/code/z_actor.c | |
| parent | b73d18b1541b39f99fcbc085f3119b73777fea89 (diff) | |
code_801780F0 OK and documented, EnPaper documented (#1061)
* File split
* Split, OK and documented
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Document relevant parts of DmBal
* Some EnPaper docs
* Document EnPaper
* Name functions
* Defake Actor_UpdateActor a bit
* Reword
* \cdot
* Fiddle with the description of the DE again
* Actually force is probably more correct
* Probably time to stop fiddling
* Format?
* Review
* Remove bug comment
* Review
* Rename to su_mtx, split off code_80140CE0
* Format
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 0483d097e..919752d74 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2353,10 +2353,8 @@ Actor* Actor_UpdateActor(UpdateActor_Params* params) { if (!Object_IsLoaded(&play->objectCtx, actor->objBankIndex)) { Actor_Kill(actor); } else { - s32 tmp = (params->unk_08 == 0); - if (((params->unk_08) && !(actor->flags & params->unk_08)) || - ((tmp = (params->unk_08 == 0)) && + ((((!params->unk_08) != 0)) && (!(actor->flags & ACTOR_FLAG_100000) || ((actor->category == ACTORCAT_EXPLOSIVES) && (params->player->stateFlags1 & PLAYER_STATE1_200))) && (params->unkC != 0) && (actor != params->unk10) && ((actor != params->player->heldActor)) && |