Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.
This commit is contained in:
parent
75042d781f
commit
cd4f755e53
|
@ -51,7 +51,7 @@ typedef enum
|
||||||
SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
|
SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
|
||||||
SF_NOSUPERSPRITES = 1<<16, // Don't use super sprites while super
|
SF_NOSUPERSPRITES = 1<<16, // Don't use super sprites while super
|
||||||
SF_NOSUPERJUMPBOOST = 1<<17, // Disable the jump boost given while super (i.e. Knuckles)
|
SF_NOSUPERJUMPBOOST = 1<<17, // Disable the jump boost given while super (i.e. Knuckles)
|
||||||
SF_CANBREAKWALLS = 1<<18, // Can naturally break walls on contact? (i.e. Knuckles)
|
SF_CANBUSTWALLS = 1<<18, // Can naturally bust walls on contact? (i.e. Knuckles)
|
||||||
// free up to and including 1<<31
|
// free up to and including 1<<31
|
||||||
} skinflags_t;
|
} skinflags_t;
|
||||||
|
|
||||||
|
@ -156,7 +156,7 @@ typedef enum
|
||||||
PF_FORCESTRAFE = 1<<28, // Turning inputs are translated into strafing inputs
|
PF_FORCESTRAFE = 1<<28, // Turning inputs are translated into strafing inputs
|
||||||
PF_CANCARRY = 1<<29, // Can carry another player?
|
PF_CANCARRY = 1<<29, // Can carry another player?
|
||||||
PF_FINISHED = 1<<30, // The player finished the level. NOT the same as exiting
|
PF_FINISHED = 1<<30, // The player finished the level. NOT the same as exiting
|
||||||
PF_CANBREAKFLOORS = 1<<31, // The player can break floors.
|
PF_CANBUSTFLOORS = 1<<31, // The player can bust floors on contact.
|
||||||
|
|
||||||
// up to 1<<31 is free
|
// up to 1<<31 is free
|
||||||
} pflags_t;
|
} pflags_t;
|
||||||
|
|
|
@ -9089,7 +9089,7 @@ static const char *const PLAYERFLAG_LIST[] = {
|
||||||
"FORCESTRAFE", // Translate turn inputs into strafe inputs
|
"FORCESTRAFE", // Translate turn inputs into strafe inputs
|
||||||
"CANCARRY", // Can carry?
|
"CANCARRY", // Can carry?
|
||||||
"FINISHED",
|
"FINISHED",
|
||||||
"CANBREAKFLOORS", // Can break floors?
|
"CANBUSTFLOORS", // Can bust floors?
|
||||||
|
|
||||||
NULL // stop loop here.
|
NULL // stop loop here.
|
||||||
};
|
};
|
||||||
|
@ -9667,7 +9667,7 @@ struct {
|
||||||
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
|
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
|
||||||
{"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
|
{"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
|
||||||
{"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
|
{"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
|
||||||
{"SF_CANBREAKWALLS",SF_CANBREAKWALLS},
|
{"SF_CANBUSTWALLS",SF_CANBUSTWALLS},
|
||||||
|
|
||||||
// Dashmode constants
|
// Dashmode constants
|
||||||
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
|
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
|
||||||
|
|
|
@ -3341,7 +3341,7 @@ static void PTR_GlideClimbTraverse(line_t *li)
|
||||||
{
|
{
|
||||||
for (rover = checksector->ffloors; rover; rover = rover->next)
|
for (rover = checksector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (slidemo->player->charflags & SF_CANBREAKWALLS)))
|
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (slidemo->player->charflags & SF_CANBUSTWALLS)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_GetFFloorTopZAt (rover, slidemo->x, slidemo->y);
|
topheight = P_GetFFloorTopZAt (rover, slidemo->x, slidemo->y);
|
||||||
|
|
16
src/p_user.c
16
src/p_user.c
|
@ -2564,7 +2564,7 @@ static boolean P_PlayerCanBust(player_t *player, ffloor_t *rover)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Strong abilities can break even FF_STRONGBUST.
|
// Strong abilities can break even FF_STRONGBUST.
|
||||||
if (player->charflags & SF_CANBREAKWALLS)
|
if (player->charflags & SF_CANBUSTWALLS)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (player->pflags & PF_BOUNCING)
|
if (player->pflags & PF_BOUNCING)
|
||||||
|
@ -2612,8 +2612,8 @@ static void P_CheckBustableBlocks(player_t *player)
|
||||||
if ((netgame || multiplayer) && player->spectator)
|
if ((netgame || multiplayer) && player->spectator)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// First iteration, check for floors we're touching directly (PF_CANBREAKFLOORS)
|
// First iteration, check for floors we're touching directly (PF_CANBUSTFLOORS)
|
||||||
if (player->pflags & PF_CANBREAKFLOORS)
|
if (player->pflags & PF_CANBUSTFLOORS)
|
||||||
{
|
{
|
||||||
for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next)
|
for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next)
|
||||||
{
|
{
|
||||||
|
@ -3255,7 +3255,7 @@ static void P_DoClimbing(player_t *player)
|
||||||
|
|
||||||
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
|
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBREAKWALLS)))
|
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
floorclimb = true;
|
floorclimb = true;
|
||||||
|
@ -3296,7 +3296,7 @@ static void P_DoClimbing(player_t *player)
|
||||||
// Is there a FOF directly below this one that we can move onto?
|
// Is there a FOF directly below this one that we can move onto?
|
||||||
for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next)
|
for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next)
|
||||||
{
|
{
|
||||||
if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBREAKWALLS)))
|
if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (roverbelow == rover)
|
if (roverbelow == rover)
|
||||||
|
@ -3341,7 +3341,7 @@ static void P_DoClimbing(player_t *player)
|
||||||
// Is there a FOF directly below this one that we can move onto?
|
// Is there a FOF directly below this one that we can move onto?
|
||||||
for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next)
|
for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next)
|
||||||
{
|
{
|
||||||
if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBREAKWALLS)))
|
if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (roverbelow == rover)
|
if (roverbelow == rover)
|
||||||
|
@ -3398,7 +3398,7 @@ static void P_DoClimbing(player_t *player)
|
||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
|
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBREAKWALLS)))
|
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
|
bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
|
||||||
|
@ -3438,7 +3438,7 @@ static void P_DoClimbing(player_t *player)
|
||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
|
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBREAKWALLS)))
|
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
|
topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
|
||||||
|
|
Loading…
Reference in a new issue