lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS

Browse source
This commit is contained in:
Snu 2020-09-29 11:05:04 +01:00
parent d07422bda1
commit 04b749f1f9
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_player.h
View file

@ -52,8 +52,6 @@ typedef enum
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_CANBREAKWALLS = 1<<18, // Can naturally break walls on contact? (i.e. Knuckles)
SF_CANBREAKFLOORS = 1<<19, // Can naturally break floors on contact?
SF_BUSTABLEBUSTER = SF_CANBREAKWALLS|SF_CANBREAKFLOORS, // Convenience skinflag.
// free up to and including 1<<31
} skinflags_t;
@ -158,6 +156,7 @@ typedef enum
PF_FORCESTRAFE = 1<<28, // Turning inputs are translated into strafing inputs
PF_CANCARRY = 1<<29, // Can carry another player?
PF_FINISHED = 1<<30, // The player finished the level. NOT the same as exiting
PF_CANBREAKFLOORS = 1<<31, // The player can break floors.
// up to 1<<31 is free
} pflags_t;

3
src/dehacked.c
View file

@ -9089,6 +9089,7 @@ static const char *const PLAYERFLAG_LIST[] = {
"FORCESTRAFE", // Translate turn inputs into strafe inputs
"CANCARRY", // Can carry?
"FINISHED",
"CANBREAKFLOORS", // Can break floors?
NULL // stop loop here.
};
@ -9667,8 +9668,6 @@ struct {
{"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
{"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
{"SF_CANBREAKWALLS",SF_CANBREAKWALLS},
{"SF_CANBREAKFLOORS",SF_CANBREAKFLOORS},
{"SF_BUSTABLEBUSTER",SF_BUSTABLEBUSTER},
// Dashmode constants
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},