Merge branch 'Saturn-Next' into Saturn-Testing
This commit is contained in:
commit
a335da3473
2 files changed
+8
-7
No files matched your search
+1
-1
@@ -2536,7 +2536,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||
UINT8 i, p;
|
||||
lumpnum_t l;
|
||||
char skin[17], color[17], *n;
|
||||
CLEANUP(Z_Pfree) char *pdemoname;
|
||||
CLEANUP(Z_Pfree) char *pdemoname = NULL;
|
||||
UINT8 version, subversion;
|
||||
UINT32 randseed;
|
||||
char msg[1024];
|
||||
|
||||
+7
-6
@@ -117,12 +117,6 @@ void M_LoadEmotes(UINT16 wadnum)
|
||||
UINT8 numframes = 0;
|
||||
|
||||
auto copy_frame = [&] {
|
||||
if (numframes == MAXEMOTEFRAMES)
|
||||
{
|
||||
CONS_Alert(CONS_WARNING, "EMOTES: Too many frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
|
||||
return false;
|
||||
}
|
||||
|
||||
size_t list_split = value.find(',');
|
||||
std::string framelumpname = value.substr(0, list_split);
|
||||
trim(framelumpname);
|
||||
@@ -136,6 +130,13 @@ void M_LoadEmotes(UINT16 wadnum)
|
||||
if (framelumpname.size() == 0)
|
||||
return false;
|
||||
|
||||
// Only print this warning if we actually got new frame
|
||||
if (numframes == MAXEMOTEFRAMES)
|
||||
{
|
||||
CONS_Alert(CONS_WARNING, "EMOTES: Too many frames. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (framelumpname.size() > 8)
|
||||
{
|
||||
CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum);
|
||||
|
||||
Reference in new issue
Block a user