Skip to content

Commit 9f0954b

Browse files
committed
Minor tweaks to blood splat code
1 parent 99cd726 commit 9f0954b

File tree

3 files changed

+13
-29
lines changed

3 files changed

+13
-29
lines changed

src/p_maputl.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,19 @@ void P_SetBloodSplatPosition(bloodsplat_t *splat)
352352

353353
splat->bprev = blink;
354354
*blink = splat;
355+
356+
splat->fifoprev = bloodsplats_fifo_tail;
357+
splat->fifonext = NULL;
358+
359+
if (bloodsplats_fifo_tail)
360+
bloodsplats_fifo_tail->fifonext = splat;
361+
else
362+
bloodsplats_fifo_head = splat;
363+
364+
bloodsplats_fifo_tail = splat;
365+
366+
if (r_bloodsplats_total < r_bloodsplats_max)
367+
r_bloodsplats_total++;
355368
}
356369

357370
//

src/p_mobj.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,23 +1706,10 @@ void P_SpawnBloodSplat(const fixed_t x, const fixed_t y, const int color, const
17061706
splat->width = spritewidth[patch];
17071707
splat->sector = sec;
17081708

1709-
splat->fifoprev = bloodsplats_fifo_tail;
1710-
splat->fifonext = NULL;
1711-
1712-
if (bloodsplats_fifo_tail)
1713-
bloodsplats_fifo_tail->fifonext = splat;
1714-
else
1715-
bloodsplats_fifo_head = splat;
1716-
1717-
bloodsplats_fifo_tail = splat;
1718-
17191709
P_SetBloodSplatPosition(splat);
17201710

17211711
if (target && target->bloodsplats)
17221712
target->bloodsplats--;
1723-
1724-
if (r_bloodsplats_total < r_bloodsplats_max)
1725-
r_bloodsplats_total++;
17261713
}
17271714

17281715
//

src/p_saveg.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,19 +1371,6 @@ static void P_SetNewTarget(mobj_t **mop, mobj_t *targ)
13711371
P_SetTarget(mop, targ);
13721372
}
13731373

1374-
static void P_AddBloodSplatToFIFO(bloodsplat_t *splat)
1375-
{
1376-
splat->fifoprev = bloodsplats_fifo_tail;
1377-
splat->fifonext = NULL;
1378-
1379-
if (bloodsplats_fifo_tail)
1380-
bloodsplats_fifo_tail->fifonext = splat;
1381-
else
1382-
bloodsplats_fifo_head = splat;
1383-
1384-
bloodsplats_fifo_tail = splat;
1385-
}
1386-
13871374
//
13881375
// P_UnarchiveThinkers
13891376
//
@@ -1474,9 +1461,6 @@ void P_UnarchiveThinkers(void)
14741461

14751462
P_SetBloodSplatColor(splat);
14761463
P_SetBloodSplatPosition(splat);
1477-
P_AddBloodSplatToFIFO(splat);
1478-
1479-
r_bloodsplats_total++;
14801464
}
14811465
}
14821466

0 commit comments

Comments
 (0)