Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
MysterD 2023-06-11 14:25:28 -07:00
parent d7f1d7cf2f
commit 1e769573e6
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/behavior_script.c
View File

@ -1415,15 +1415,13 @@ cur_obj_update_begin:;
// Out of render distance, hide the object. // Out of render distance, hide the object.
gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE; gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
if (gBehaviorValues.InfiniteRenderDistance) if (gBehaviorValues.InfiniteRenderDistance) {
{
gCurrentObject->activeFlags &= ~ACTIVE_FLAG_FAR_AWAY; gCurrentObject->activeFlags &= ~ACTIVE_FLAG_FAR_AWAY;
} } else {
else
{
// the following flag would deactivate behavior code // sorry but I need this // the following flag would deactivate behavior code // sorry but I need this
gCurrentObject->activeFlags |= ACTIVE_FLAG_FAR_AWAY; gCurrentObject->activeFlags |= ACTIVE_FLAG_FAR_AWAY;
} }
} else if (gCurrentObject->oHeldState == HELD_FREE) { } else if (gCurrentObject->oHeldState == HELD_FREE) {
// In render distance (and not being held), show the object. // In render distance (and not being held), show the object.
gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE; gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;

3
src/game/interaction.c
View File

@ -1940,9 +1940,8 @@ u32 interact_koopa_shell(struct MarioState *m, UNUSED u32 interactType, struct O
return FALSE; return FALSE;
} }
for (s32 i = 0; i < MAX_PLAYERS; i++) { for (s32 i = 1; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; } if (!is_player_active(&gMarioStates[i])) { continue; }
if (i == 0) { continue; }
if (gMarioStates[i].riddenObj == o) { return FALSE; } if (gMarioStates[i].riddenObj == o) { return FALSE; }
} }