From a00dfcf4205f88cd6149daf73fec4831a7d7c2e5 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 25 Oct 2019 21:18:36 -0700
Subject: [PATCH] Oh right, the keywords...

---
 src/dehacked.c   | 5 -----
 src/doomstat.h   | 1 -
 src/g_game.c     | 3 ---
 src/lua_maplib.c | 2 --
 src/p_setup.c    | 1 -
 5 files changed, 12 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 35274660d..34ee1f170 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1205,11 +1205,6 @@ static void readlevelheader(MYFILE *f, INT32 num)
 					mapheaderinfo[num-1]->typeoflevel = tol;
 				}
 			}
-			else if (fastcmp(word, "KEYWORD"))
-			{
-				deh_strlcpy(mapheaderinfo[num-1]->keyword, word2,
-						sizeof(mapheaderinfo[num-1]->keyword), va("Level header %d: keyword", num));
-			}
 			else if (fastcmp(word, "MUSIC"))
 			{
 				if (fastcmp(word2, "NONE"))
diff --git a/src/doomstat.h b/src/doomstat.h
index e01cf3227..7d06f03e2 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -286,7 +286,6 @@ typedef struct
 	UINT8 actnum;          ///< Act number or 0 for none.
 	UINT16 typeoflevel;    ///< Combination of typeoflevel flags.
 	INT16 nextlevel;       ///< Map number of next level, or 1100-1102 to end.
-	char keyword[33];      ///< Keywords separated by space to search for. 32 characters.
 	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.
 	UINT32 muspos;    ///< Music position to jump to.
diff --git a/src/g_game.c b/src/g_game.c
index 9ebbc630c..7a50c9065 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4164,9 +4164,6 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
 				measurekeywords(&freq[freqc],
 						&freq[freqc].matchd, &freq[freqc].matchc,
 						realmapname, mapname, wanttable);
-				measurekeywords(&freq[freqc],
-						&freq[freqc].keywhd, &freq[freqc].keywhc,
-						mapheaderinfo[i]->keyword, mapname, wanttable);
 				if (freq[freqc].total)
 					freqc++;
 			}
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 53ff29962..1da232efa 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -2014,8 +2014,6 @@ static int mapheaderinfo_get(lua_State *L)
 		lua_pushinteger(L, header->typeoflevel);
 	else if (fastcmp(field,"nextlevel"))
 		lua_pushinteger(L, header->nextlevel);
-	else if (fastcmp(field,"keyword"))
-		lua_pushstring(L, header->keyword);
 	else if (fastcmp(field,"musname"))
 		lua_pushstring(L, header->musname);
 	else if (fastcmp(field,"mustrack"))
diff --git a/src/p_setup.c b/src/p_setup.c
index d98269065..cef176636 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -211,7 +211,6 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
 	mapheaderinfo[num]->typeoflevel = 0;
 	mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
 	mapheaderinfo[num]->startrings = 0;
-	mapheaderinfo[num]->keyword[0] = '\0';
 	snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
 	mapheaderinfo[num]->musname[6] = 0;
 	mapheaderinfo[num]->mustrack = 0;