Oh right, the keywords...
(cherry picked from commit a922de8242143a55eb0c19cc5a65bb9126213f29)
This commit is contained in:
1 parent
d630706377
commit
c7a31ea5de
5 files changed
-13
No files matched your search
@@ -1052,11 +1052,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"))
|
||||
|
||||
@@ -222,7 +222,6 @@ typedef struct
|
||||
char actnum[3]; ///< SRB2Kart: Now a 2 character long string.
|
||||
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.
|
||||
|
||||
@@ -4871,9 +4871,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++;
|
||||
}
|
||||
|
||||
@@ -1449,8 +1449,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"))
|
||||
|
||||
@@ -190,8 +190,6 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
|
||||
mapheaderinfo[num]->typeoflevel = 0;
|
||||
DEH_WriteUndoline("NEXTLEVEL", va("%d", mapheaderinfo[num]->nextlevel), UNDO_NONE);
|
||||
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
|
||||
DEH_WriteUndoline("KEYWORD", mapheaderinfo[num]->keyword, UNDO_NONE);
|
||||
mapheaderinfo[num]->keyword[0] = '\0';
|
||||
DEH_WriteUndoline("MUSIC", mapheaderinfo[num]->musname, UNDO_NONE);
|
||||
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
|
||||
mapheaderinfo[num]->musname[6] = 0;
|
||||
|
||||
Reference in new issue
Block a user