diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-06-10 15:12:51 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-06-10 15:12:51 +0200 |
| commit | 551cb7209393d06e302a5bda489c341f38efd1f3 (patch) | |
| tree | 5e35657ef65d6cd14963cd1efc051251d1a433ce /src/script.c | |
| parent | 99c0d42297567b54510056caff059fc374513458 (diff) | |
Extract some map data definitions
Diffstat (limited to 'src/script.c')
| -rw-r--r-- | src/script.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script.c b/src/script.c index e18a0359..0c6ecd50 100644 --- a/src/script.c +++ b/src/script.c @@ -1382,7 +1382,7 @@ void ScriptCommand_MoveTo(Entity* entity, ScriptExecutionContext* context) { void ScriptCommand_LookAt(Entity* entity, ScriptExecutionContext* context) { LookAt(entity, context, context->scriptInstructionPointer[1] + gRoomControls.origin_x, - context->scriptInstructionPointer[2] + gRoomControls.origin_y); + context->scriptInstructionPointer[2] + gRoomControls.origin_y); gActiveScriptInfo.flags |= 1; } @@ -1390,8 +1390,8 @@ void ScriptCommand_MoveTowardsTarget(Entity* entity, ScriptExecutionContext* con s32 tmp, tmp2; if (!--context->unk_19) { context->unk_19 = 8; - entity->direction = - CalculateDirectionFromOffsets(context->x.HALF.HI - entity->x.HALF.HI, context->y.HALF.HI - entity->y.HALF.HI); + entity->direction = CalculateDirectionFromOffsets(context->x.HALF.HI - entity->x.HALF.HI, + context->y.HALF.HI - entity->y.HALF.HI); } tmp = entity->x.HALF.HI - context->x.HALF.HI; tmp2 = entity->y.HALF.HI - context->y.HALF.HI; @@ -1423,7 +1423,7 @@ void ScriptCommand_MoveToOffset(Entity* entity, ScriptExecutionContext* context) if (!context->unk_18) { context->unk_18 = 1; LookAt(entity, context, entity->x.HALF.HI + ((s16)context->scriptInstructionPointer[1]), - entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2])); + entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2])); } ScriptCommand_MoveTowardsTarget(entity, context); // Repeat this command until we are at the target. |