stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Death of TOL_CUSTOM

Browse source
This commit is contained in:
Jaime Passos 2019-12-18 12:40:46 -03:00
parent 45580ce557
commit b759ebf622
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dehacked.c
View file

@ -1114,8 +1114,6 @@ static const struct {
{"TAG",TOL_TAG}, {"TAG",TOL_TAG},
{"CTF",TOL_CTF}, {"CTF",TOL_CTF},
{"CUSTOM",TOL_CUSTOM},
{"2D",TOL_2D}, {"2D",TOL_2D},
{"MARIO",TOL_MARIO}, {"MARIO",TOL_MARIO},
{"NIGHTS",TOL_NIGHTS}, {"NIGHTS",TOL_NIGHTS},
@ -9042,7 +9040,6 @@ struct {
{"TOL_MATCH",TOL_MATCH}, {"TOL_MATCH",TOL_MATCH},
{"TOL_TAG",TOL_TAG}, {"TOL_TAG",TOL_TAG},
{"TOL_CTF",TOL_CTF}, {"TOL_CTF",TOL_CTF},
{"TOL_CUSTOM",TOL_CUSTOM},
{"TOL_2D",TOL_2D}, {"TOL_2D",TOL_2D},
{"TOL_MARIO",TOL_MARIO}, {"TOL_MARIO",TOL_MARIO},
{"TOL_NIGHTS",TOL_NIGHTS}, {"TOL_NIGHTS",TOL_NIGHTS},

4
src/doomstat.h
View file

@ -287,7 +287,7 @@ typedef struct
char lvlttl[22]; ///< Level name without "Zone". (21 character limit instead of 32, 21 characters can display on screen max anyway) char lvlttl[22]; ///< Level name without "Zone". (21 character limit instead of 32, 21 characters can display on screen max anyway)
char subttl[33]; ///< Subtitle for level char subttl[33]; ///< Subtitle for level
UINT8 actnum; ///< Act number or 0 for none. UINT8 actnum; ///< Act number or 0 for none.
UINT16 typeoflevel; ///< Combination of typeoflevel flags. UINT32 typeoflevel; ///< Combination of typeoflevel flags.
INT16 nextlevel; ///< Map number of next level, or 1100-1102 to end. INT16 nextlevel; ///< Map number of next level, or 1100-1102 to end.
char musname[7]; ///< Music track to play. "" for no music. char musname[7]; ///< Music track to play. "" for no music.
UINT16 mustrack; ///< Subsong to play. Only really relevant for music modules and specific formats supported by GME. 0 to ignore. UINT16 mustrack; ///< Subsong to play. Only really relevant for music modules and specific formats supported by GME. 0 to ignore.
@ -379,7 +379,7 @@ enum TypeOfLevel
TOL_CTF = 0x40, ///< Capture the Flag TOL_CTF = 0x40, ///< Capture the Flag
// CTF default = 64 // CTF default = 64
TOL_CUSTOM = 0x80, ///< Custom (Lua-scripted, etc.) //TOL_CUSTOM = 0x80, ///< Custom (Lua-scripted, etc.)
TOL_2D = 0x0100, ///< 2D TOL_2D = 0x0100, ///< 2D
TOL_MARIO = 0x0200, ///< Mario TOL_MARIO = 0x0200, ///< Mario