stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 21:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit

Browse source 
# Conflicts:
#	src/p_user.c
This commit is contained in:
toasterbabe 2017-10-14 19:12:15 +01:00
commit 8e389382ed
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.c
View file

@ -9850,7 +9850,7 @@ ML_EFFECT4 : Don't clip inside the ground
mmin = mnumspokes; mmin = mnumspokes;
// Make the links the same type as the end - repeated below // Make the links the same type as the end - repeated below
if ((mobj->type != MT_CHAINPOINT) && (!(lines[line].flags & ML_EFFECT2) == (mobj->type == MT_FIREBARPOINT))) // exclusive or if ((mobj->type != MT_CHAINPOINT) && ((lines[line].flags & ML_EFFECT2) != (mobj->type == MT_FIREBARPOINT))) // exclusive or
{ {
linktype = macetype; linktype = macetype;
radiusfactor = 2; // Double the radius. radiusfactor = 2; // Double the radius.

6
src/p_user.c
View file

@ -3676,7 +3676,7 @@ static void P_DoSuperStuff(player_t *player)
P_SpawnShieldOrb(player); P_SpawnShieldOrb(player);
// Restore color // Restore color
if ((player->powers[pw_shield] & SH_NOSTACK) == SH_FIREFLOWER) if ((player->powers[pw_shield] & SH_STACK) == SH_FIREFLOWER)
{ {
player->mo->color = SKINCOLOR_WHITE; player->mo->color = SKINCOLOR_WHITE;
G_GhostAddColor(GHC_FIREFLOWER); G_GhostAddColor(GHC_FIREFLOWER);
@ -3726,7 +3726,7 @@ static void P_DoSuperStuff(player_t *player)
player->powers[pw_super] = 0; player->powers[pw_super] = 0;
// Restore color // Restore color
if ((player->powers[pw_shield] & SH_NOSTACK) == SH_FIREFLOWER) if ((player->powers[pw_shield] & SH_STACK) == SH_FIREFLOWER)
{ {
player->mo->color = SKINCOLOR_WHITE; player->mo->color = SKINCOLOR_WHITE;
G_GhostAddColor(GHC_FIREFLOWER); G_GhostAddColor(GHC_FIREFLOWER);
@ -6920,7 +6920,7 @@ static void P_MovePlayer(player_t *player)
skin_t *skin = ((skin_t *)(player->mo->skin)); skin_t *skin = ((skin_t *)(player->mo->skin));
if (skin->flags & SF_SUPER && player->mo->color < MAXSKINCOLORS) if (skin->flags & SF_SUPER && player->mo->color < MAXSKINCOLORS)
G_GhostAddColor(GHC_SUPER); G_GhostAddColor(GHC_SUPER);
player->mo->color = (skin->flags & SF_SUPER) ? skin->supercolor + abs((((player->startedtime - player->nightstime) >> 1) % 9) - 4) : player->mo->color; // This is where super flashing is handled. player->mo->color = (skin->flags & SF_SUPER) ? skin->supercolor + abs((((signed)(player->startedtime - player->nightstime) >> 1) % 9) - 4) : player->mo->color; // This is where super flashing is handled.
} }
if (!player->capsule && !player->bonustime) if (!player->capsule && !player->bonustime)