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

Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next.

Browse source
This commit is contained in:
Nev3r 2020-10-27 22:13:10 +01:00
parent 586dc0b631
commit ad9e3411a1
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dehacked.c
View file

@ -9918,7 +9918,7 @@ struct {
// Bustable FOF type // Bustable FOF type
{"BT_TOUCH",BT_TOUCH}, {"BT_TOUCH",BT_TOUCH},
{"BT_SPIN",BT_SPIN}, {"BT_SPINBUST",BT_SPINBUST},
{"BT_REGULAR",BT_REGULAR}, {"BT_REGULAR",BT_REGULAR},
{"BT_STRONG",BT_STRONG}, {"BT_STRONG",BT_STRONG},

2
src/p_mobj.c
View file

@ -1722,7 +1722,7 @@ static void P_PushableCheckBustables(mobj_t *mo)
continue; continue;
break; break;
case BT_SPIN: case BT_SPINBUST:
if (mo->z + mo->momz > topheight) if (mo->z + mo->momz > topheight)
continue; continue;

6
src/p_spec.c
View file

@ -6867,7 +6867,7 @@ void P_SpawnSpecials(boolean fromnetsave)
busttype = BT_TOUCH; busttype = BT_TOUCH;
break; break;
case TMFB_SPIN: case TMFB_SPIN:
busttype = BT_SPIN; busttype = BT_SPINBUST;
break; break;
case TMFB_REGULAR: case TMFB_REGULAR:
busttype = BT_REGULAR; busttype = BT_REGULAR;
@ -6939,7 +6939,7 @@ void P_SpawnSpecials(boolean fromnetsave)
fflr->busttype = BT_TOUCH; fflr->busttype = BT_TOUCH;
break; break;
case TMFB_SPIN: case TMFB_SPIN:
fflr->busttype = BT_SPIN; fflr->busttype = BT_SPINBUST;
break; break;
case TMFB_REGULAR: case TMFB_REGULAR:
fflr->busttype = BT_REGULAR; fflr->busttype = BT_REGULAR;
@ -7298,7 +7298,7 @@ void P_SpawnSpecials(boolean fromnetsave)
busttype = BT_TOUCH; busttype = BT_TOUCH;
break; break;
case TMFB_SPIN: case TMFB_SPIN:
busttype = BT_SPIN; busttype = BT_SPINBUST;
break; break;
case TMFB_REGULAR: case TMFB_REGULAR:
busttype = BT_REGULAR; busttype = BT_REGULAR;

6
src/p_user.c
View file

@ -2552,7 +2552,7 @@ static boolean P_PlayerCanBust(player_t *player, ffloor_t *rover)
{ {
case BT_TOUCH: // Shatters on contact case BT_TOUCH: // Shatters on contact
return true; return true;
case BT_SPIN: // Can be busted by spinning (either from jumping or spindashing) case BT_SPINBUST: // Can be busted by spinning (either from jumping or spindashing)
if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_STARTDASH)) if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_STARTDASH))
return true; return true;
@ -2668,7 +2668,7 @@ static void P_CheckBustableBlocks(player_t *player)
continue; continue;
break; break;
case BT_SPIN: case BT_SPINBUST:
if (player->mo->z + player->mo->momz > topheight) if (player->mo->z + player->mo->momz > topheight)
continue; continue;
@ -2688,7 +2688,7 @@ static void P_CheckBustableBlocks(player_t *player)
} }
// Impede the player's fall a bit // Impede the player's fall a bit
if (((rover->busttype == BT_TOUCH) || (rover->busttype == BT_SPIN)) && player->mo->z >= topheight) if (((rover->busttype == BT_TOUCH) || (rover->busttype == BT_SPINBUST)) && player->mo->z >= topheight)
player->mo->momz >>= 1; player->mo->momz >>= 1;
else if (rover->busttype == BT_TOUCH) else if (rover->busttype == BT_TOUCH)
{ {

2
src/r_defs.h
View file

@ -162,7 +162,7 @@ typedef enum
typedef enum typedef enum
{ {
BT_TOUCH, BT_TOUCH,
BT_SPIN, BT_SPINBUST,
BT_REGULAR, BT_REGULAR,
BT_STRONG, BT_STRONG,
} busttype_e; } busttype_e;