incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reapply "Cache emotes on registration rather then at runtime"

Browse source 
This reverts commit 204d476b3e.
This commit is contained in:
NepDisk 2025-12-06 14:05:14 -05:00
parent fc55674fc4
commit ddd6fa6c0b
2 changed files with 17 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/m_emotes.cpp
View file

@ -21,8 +21,6 @@ static void Command_ListEmotes_f(void);
static std::map<std::string, emote_t> emotes;
static std::vector<emotecache_t> emotecache;
// TODO - Would be really nice to generalize soc-like file parsing and not reimplement it 100 times :)))))
void M_LoadEmotes(UINT16 wadnum)
{
@ -169,6 +167,13 @@ void M_LoadEmotes(UINT16 wadnum)
{
CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized field '%s'. (file %s, line %d)\n", field.c_str(), wadfiles[wadnum]->filename, linenum);
}
// Cache frames for speedy use later.
for (size_t i = 0; i < MAXEMOTEFRAMES; i++)
{
emote->frames_cached[i] = (patch_t *)W_CachePatchName(emote->frames[i], PU_CACHE);
}
}
else
{
@ -246,48 +251,20 @@ emote_t *M_VerifyEmote(const char *name, int *emotelen)
return match;
}
static patch_t *M_ReturnEmotePatch(const char *lumpname)
{
UINT32 hash = HASH32(lumpname, 8);
emotecache_t cache;
if (emotecache.empty())
{
cache = {lumpname, hash, (patch_t*)W_CachePatchName(lumpname, PU_CACHE)};
emotecache.push_back(cache);
return emotecache.back().patch;
}
else
{
size_t i;
for (i = 0; i < emotecache.size(); i++)
{
if (emotecache[i].hash != hash)
continue;
if (stricmp(emotecache[i].name, lumpname))
continue;
return emotecache[i].patch;
}
cache = {lumpname, hash, (patch_t*)W_CachePatchName(lumpname, PU_CACHE)};
emotecache.push_back(cache);
return emotecache.back().patch;
}
}
void M_DrawScaledEmote(fixed_t x, fixed_t y, fixed_t scale, emote_t *emote, INT32 flags)
{
if (emote->numframes == 0)
return;
const char *lumpname = emote->frames[(I_GetTime()/emote->timeperframe) % emote->numframes];
// Cache this emote patch after grabbing it for the first time
// so packed addon lists don't get their frames nuked by cachenum calls...
patch_t *emotepatch = M_ReturnEmotePatch(lumpname);
//const char *lumpname = emote->frames[(I_GetTime()/emote->timeperframe) % emote->numframes];
INT32 emoteframe = (I_GetTime()/emote->timeperframe) % emote->numframes;
patch_t *emotepatch = emote->frames_cached[emoteframe];
if (!emotepatch)
{
CONS_Printf("Emote Patch is NULL?\n");
return;
}
const int CHARHEIGHT = 6;

7
src/m_emotes.h
View file

@ -20,14 +20,9 @@ typedef struct emote_s {
char frames[MAXEMOTEFRAMES][9];
UINT8 numframes;
tic_t timeperframe;
patch_t *frames_cached[MAXEMOTEFRAMES];
} emote_t;
typedef struct emotecache_s {
const char *name;
UINT32 hash;
patch_t *patch;
} emotecache_t;
// Reads and adds emotes from EMOTES lump, with syntax similar to soc
void M_LoadEmotes(UINT16 wadnum);