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

Better bumpspark bitmask reading (thanks GHG)

Browse source
This commit is contained in:
Anonimus 2025-09-23 11:31:59 -04:00
parent e5d866eb6f
commit 855d25ae13
2 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/g_demo.c
View file

@ -2744,14 +2744,18 @@ void G_BeginRecording(void)
raflags |= RAF_SLOPEBOOST;
if (cv_dummyattackingairdrop.value)
raflags |= RAF_AIRDROP;
if (cv_dummyattackingbumpspark.value == BUMPSPARK_ALL)
raflags |= RAF_BUMPSPARK;
if (cv_dummyattackingbumpspark.value == BUMPSPARK_RESET100)
switch (cv_dummyattackingbumpspark.value)
{
raflags |= (RAF_BUMPSPARK|RAF_BS_RESET100);
}
if (cv_dummyattackingbumpspark.value == BUMPSPARK_NOCHARGE)
case BUMPSPARK_ALL:
raflags |= RAF_BUMPSPARK;
break;
case BUMPSPARK_RESET100:
raflags |= RAF_BS_RESET100;
break;
case BUMPSPARK_NOCHARGE:
raflags |= RAF_BUMPDRIFT;
break;
}
}
else
{
@ -3942,20 +3946,24 @@ void G_AddGhost(char *defdemoname)
ourraflags |= RAF_SLOPEBOOST;
if (cv_dummyattackingairdrop.value)
ourraflags |= RAF_AIRDROP;
if (cv_dummyattackingbumpspark.value == BUMPSPARK_ALL)
raflags |= RAF_BUMPSPARK;
if (cv_dummyattackingbumpspark.value == BUMPSPARK_RESET100)
switch (cv_dummyattackingbumpspark.value)
{
raflags |= (RAF_BUMPSPARK|RAF_BS_RESET100);
}
if (cv_dummyattackingbumpspark.value == BUMPSPARK_NOCHARGE)
case BUMPSPARK_ALL:
raflags |= RAF_BUMPSPARK;
break;
case BUMPSPARK_RESET100:
raflags |= RAF_BS_RESET100;
break;
case BUMPSPARK_NOCHARGE:
raflags |= RAF_BUMPDRIFT;
break;
}
if (demoversion <= 0x000B)
{
ourraflags &= ~RAF_AIRDROP;
ourraflags &= ~RAF_BUMPDRIFT;
ourraflags &= ~RAF_BUMPSPARK;
ourraflags &= ~RAF_BUMPSPARKMASK;
}
if (ourraflags != raflags)

17
src/p_setup.c
View file

@ -8158,15 +8158,18 @@ static void P_InitLevelSettings(boolean reloadinggamestate)
airdropactive = true;
// Bump Spark
if (raflags & RAF_BUMPSPARK)
switch (raflags & RAF_BUMPSPARKMASK)
{
if (raflags & RAF_BS_RESET100)
bumpsparkactive = BUMPSPARK_RESET100;
else
bumpsparkactive = BUMPSPARK_ALL;
}
else if (raflags & RAF_BUMPDRIFT)
case RAF_BUMPDRIFT:
bumpsparkactive = BUMPSPARK_NOCHARGE;
break;
case RAF_BUMPSPARK:
bumpsparkactive = BUMPSPARK_ALL;
break;
case RAF_BS_RESET100:
bumpsparkactive = BUMPSPARK_RESET100;
break;
}
}
else
{