incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update some loops stuff to be more up to date

Browse source
This commit is contained in:
NepDisk 2025-09-22 15:15:09 -04:00
parent fb5b72a600
commit 5beb1619d5
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/objects/loops.cpp
View file

@ -1,7 +1,7 @@
// BLANKART // BLANKART
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 2023 by James R. // Copyright (C) 2025 by James Robert Roman
// Copyright (C) 2023 by Kart Krew // Copyright (C) 2025 by Kart Krew
// //
// This program is free software distributed under the // This program is free software distributed under the
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
@ -180,10 +180,8 @@ Obj_InitLoopEndpoint
void void
Obj_InitLoopCenter (mobj_t *center) Obj_InitLoopCenter (mobj_t *center)
{ {
const mapthing_t *mt = center->spawnpoint; center_max_revolution(center) = center->args[1] * FRACUNIT / 360;
center_set_flip(center, center->args[0]);
center_max_revolution(center) = mt->args[1] * FRACUNIT / 360;
center_set_flip(center, mt->args[0]);
} }
void void
@ -260,7 +258,7 @@ Obj_LoopEndpointCollide
const fixed_t magnitude = R_PointToDist2(0, 0, px, py); const fixed_t magnitude = R_PointToDist2(0, 0, px, py);
const fixed_t newX = FixedDiv(px, magnitude); const fixed_t newX = FixedDiv(px, magnitude);
const fixed_t newY = FixedDiv(py, magnitude); const fixed_t newY = FixedDiv(py, magnitude);
s->origin_shift = {FixedMul(newX, FCOS(anchor->angle)), s->origin_shift = {FixedMul(newX, FCOS(anchor->angle)),
FixedMul(newY, FSIN(anchor->angle))}; FixedMul(newY, FSIN(anchor->angle))};
} }
@ -285,15 +283,15 @@ Obj_LoopEndpointCollide
cam->enter_tic = leveltime; cam->enter_tic = leveltime;
cam->exit_tic = INFTICS; cam->exit_tic = INFTICS;
if (center->spawnpoint->args[4]) // is camera distance set? if (center->args[4]) // is camera distance set?
{ {
cam->zoom_out_speed = center->spawnpoint->args[2]; cam->zoom_out_speed = center->args[2];
cam->zoom_in_speed = center->spawnpoint->args[3]; cam->zoom_in_speed = center->args[3];
cam->dist = center->spawnpoint->args[4] * FRACUNIT; cam->dist = center->args[4] * FRACUNIT;
cam->pan = FixedAngle(center->spawnpoint->args[5] * FRACUNIT); cam->pan = FixedAngle(center->args[5] * FRACUNIT);
cam->pan_speed = center->spawnpoint->args[6] * FRACUNIT; cam->pan_speed = center->args[6] * FRACUNIT;
cam->pan_accel = center->spawnpoint->args[7]; cam->pan_accel = center->args[7];
cam->pan_back = center->spawnpoint->args[8]; cam->pan_back = center->args[8];
} }
else else
{ {

4
src/p_loop.c
View file

@ -1,6 +1,7 @@
// BLANKART // BLANKART
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 2023 by Kart Krew // Copyright (C) 2025 by James Robert Roman.
// Copyright (C) 2025 by Kart Krew.
// //
// This program is free software distributed under the // This program is free software distributed under the
// terms of the GNU General Public License, version 2. // terms of the GNU General Public License, version 2.
@ -11,7 +12,6 @@
#include "doomdef.h" #include "doomdef.h"
#include "d_player.h" #include "d_player.h"
#include "doomstat.h"
#include "k_kart.h" #include "k_kart.h"
#include "p_local.h" #include "p_local.h"
#include "p_setup.h" #include "p_setup.h"