From e1ae74c56a4651bf7f552427fd69fbb16878f0a9 Mon Sep 17 00:00:00 2001 From: Nev3r Date: Mon, 16 Dec 2019 19:10:39 +0100 Subject: [PATCH] Disable new unused multitag code for now. --- src/p_setup.c | 8 ++++---- src/p_spec.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 35345dc03..343072c6a 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -376,7 +376,7 @@ UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade) return mapheaderinfo[map-1]->grades[mare].grade[grade-1]; } - +/* static void Tags_Add (tags_t* itemtags, const UINT16 tag) { itemtags->numtags++; @@ -388,7 +388,7 @@ static void Tags_Add (tags_t* itemtags, const UINT16 tag) itemtags->tags[itemtags->numtags - 1] = tag; } - +*/ /** Loads the vertexes for a level. * * \param lump VERTEXES lump number. @@ -697,7 +697,7 @@ static void P_LoadRawSectors(UINT8 *data) ss->spawn_lightlevel = SHORT(ms->lightlevel); ss->special = SHORT(ms->special); ss->tag = SHORT(ms->tag); - Tags_Add(&(ss->tags), ss->tag); +// Tags_Add(&(ss->tags), ss->tag); } } @@ -1050,7 +1050,7 @@ static void TextmapSector(UINT32 i, char *param) else if (fastcmp(param, "id")) { sectors[i].tag = atol(M_GetToken(NULL)); - Tags_Add(§ors[i].tags, sectors[i].tag); +// Tags_Add(§ors[i].tags, sectors[i].tag); } else if (fastcmp(param, "xpanningfloor")) sectors[i].floor_xoffs = FLOAT_TO_FIXED(atof(M_GetToken(NULL))); diff --git a/src/p_spec.c b/src/p_spec.c index 0834400de..59559d876 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -1633,7 +1633,7 @@ static inline void P_InitTagLists(void) lines[i].nexttag = lines[j].firsttag; lines[j].firsttag = (INT32)i; } - +/* for (i = 0; i < MAXTAGS; i++) taglist_sec[i] = NULL; @@ -1656,6 +1656,7 @@ static inline void P_InitTagLists(void) } } } +*/ } #undef MAXTAGS