thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

append_hyudoro, pop_hyudoro: fix linked list handling

Browse source 
- Use P_SetTarget to handle reference counting properly
- Properly unlink from the start of the list
This commit is contained in:
James R. 2023-09-17 19:12:12 -07:00
parent c850248873
commit 3b19376848
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/objects/hyudoro.c
View file

@ -91,7 +91,8 @@ get_look_angle (mobj_t *thing)
static boolean static boolean
is_hyudoro (mobj_t *thing) is_hyudoro (mobj_t *thing)
{ {
return thing && thing->type == MT_HYUDORO; return !P_MobjWasRemoved(thing) &&
thing->type == MT_HYUDORO;
} }
static mobj_t * static mobj_t *
@ -346,7 +347,7 @@ append_hyudoro
} }
hyudoro_stackpos(hyu) = lastpos + 1; hyudoro_stackpos(hyu) = lastpos + 1;
*head = hyu; P_SetTarget(head, hyu);
} }
static void static void
@ -354,26 +355,37 @@ pop_hyudoro (mobj_t **head)
{ {
mobj_t *hyu = *head; mobj_t *hyu = *head;
INT32 lastpos; if (!is_hyudoro(hyu))
INT32 thispos;
if (is_hyudoro(hyu))
{ {
lastpos = hyudoro_stackpos(hyu); return;
hyu = hyudoro_next(hyu);
while (is_hyudoro(hyu))
{
thispos = hyudoro_stackpos(hyu);
hyudoro_stackpos(hyu) = lastpos;
lastpos = thispos;
hyu = hyudoro_next(hyu);
}
} }
*head = hyu; INT32 lastpos = hyudoro_stackpos(hyu);
{
mobj_t *next = hyudoro_next(hyu);
P_SetTarget(head, next);
P_SetTarget(&hyudoro_next(hyu), NULL);
hyu = next;
}
if (!is_hyudoro(hyu))
{
return;
}
do
{
INT32 thispos = hyudoro_stackpos(hyu);
hyudoro_stackpos(hyu) = lastpos;
lastpos = thispos;
hyu = hyudoro_next(hyu);
}
while (is_hyudoro(hyu));
} }
static void hyudoro_set_held_item_from_player static void hyudoro_set_held_item_from_player