From 44245a18d0405e829983c844579a0cde15ff0760 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 17 Oct 2023 20:19:05 -0700 Subject: [PATCH] Default loop camera settings if camera distance is not set --- src/objects/loops.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/objects/loops.cpp b/src/objects/loops.cpp index 9d2262848..930fc6cd3 100644 --- a/src/objects/loops.cpp +++ b/src/objects/loops.cpp @@ -356,13 +356,26 @@ Obj_LoopEndpointCollide cam->enter_tic = leveltime; cam->exit_tic = INFTICS; - cam->zoom_out_speed = center->thing_args[2]; - cam->zoom_in_speed = center->thing_args[3]; - cam->dist = center->thing_args[4] * FRACUNIT; - cam->pan = FixedAngle(center->thing_args[5] * FRACUNIT); - cam->pan_speed = center->thing_args[6] * FRACUNIT; - cam->pan_accel = center->thing_args[7]; - cam->pan_back = center->thing_args[8]; + if (center->thing_args[4]) // is camera distance set? + { + cam->zoom_out_speed = center->thing_args[2]; + cam->zoom_in_speed = center->thing_args[3]; + cam->dist = center->thing_args[4] * FRACUNIT; + cam->pan = FixedAngle(center->thing_args[5] * FRACUNIT); + cam->pan_speed = center->thing_args[6] * FRACUNIT; + cam->pan_accel = center->thing_args[7]; + cam->pan_back = center->thing_args[8]; + } + else + { + cam->zoom_out_speed = 20; + cam->zoom_in_speed = 60; + cam->dist = radius; + cam->pan = ANGLE_22h; + cam->pan_speed = 6*FRACUNIT; + cam->pan_accel = 10; + cam->pan_back = 40; + } player->speed = 3 * (player->speed + toucher->momz) / 2;