Load emotes from base wads too at boot (so it loads ones from -file wads)

This commit is contained in:
indev committed 2025-06-28 22:31:33 +03:00
1 parent 4b129314d3
commit 74bdabc636
3 files changed
+13

No files matched your search

+3
View File
@@ -40,6 +40,7 @@
#include "g_game.h"
#include "g_input.h"
#include "hu_stuff.h"
#include "m_emotes.h"
#include "i_sound.h"
#include "i_system.h"
#include "i_time.h"
@@ -1997,6 +1998,8 @@ void D_SRB2Main(void)
S_InitMusicDefs();
M_InitEmotes();
CONS_Printf("ST_Init(): Init status bar.\n");
ST_Init();
+7
View File
@@ -163,6 +163,13 @@ void M_LoadEmotes(UINT16 wadnum)
CONS_Printf("Added %d emotes\n", numemotes);
}
void M_InitEmotes(void)
{
UINT16 i;
for (i = 0; i < numwadfiles; i++)
M_LoadEmotes(i);
}
emote_t *M_FindEmote(const char *name, int skip)
{
if (!cv_emotes.value)
+3
View File
@@ -22,6 +22,9 @@ typedef struct emote_s {
// Reads and adds emotes from EMOTES lump, with syntax similar to soc
void M_LoadEmotes(UINT16 wadnum);
// Load emotes from all base wads
void M_InitEmotes(void);
// Finds first matching emote, ignoring first few matches
emote_t *M_FindEmote(const char *name, int skips);