From 74bdabc636afa93283ccfa98904f2ba33d97b39a Mon Sep 17 00:00:00 2001 From: Indev Date: Sat, 28 Jun 2025 22:31:33 +0300 Subject: [PATCH] Load emotes from base wads too at boot (so it loads ones from -file wads) --- src/d_main.c | 3 +++ src/m_emotes.cpp | 7 +++++++ src/m_emotes.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/src/d_main.c b/src/d_main.c index ecd7e6247..fbc2c6c03 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -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(); diff --git a/src/m_emotes.cpp b/src/m_emotes.cpp index 50718b79b..4c28f72b4 100644 --- a/src/m_emotes.cpp +++ b/src/m_emotes.cpp @@ -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) diff --git a/src/m_emotes.h b/src/m_emotes.h index f3e1875ce..0290e3909 100644 --- a/src/m_emotes.h +++ b/src/m_emotes.h @@ -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);