AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

SNDINFO: warning instead of error out (#2309)

Browse Source
This commit is contained in:
Roman Fomin 2025-07-09 14:45:38 +07:00 committed by GitHub
parent e0677008ed
commit 790be8d7a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/m_scanner.c
View File

@ -33,6 +33,7 @@
#include <string.h> #include <string.h>
#include "doomtype.h" #include "doomtype.h"
#include "i_printf.h"
#include "i_system.h" #include "i_system.h"
#include "m_misc.h" #include "m_misc.h"
@ -589,7 +590,7 @@ boolean SC_CheckToken(scanner_t *s, char token)
return false; return false;
} }
void SC_Error(scanner_t *s, const char *msg, ...) void SC_PrintMsg(scmsg_t type, scanner_t *s, const char *msg, ...)
{ {
char buffer[1024]; char buffer[1024];
va_list args; va_list args;
@ -597,8 +598,16 @@ void SC_Error(scanner_t *s, const char *msg, ...)
M_vsnprintf(buffer, sizeof(buffer), msg, args); M_vsnprintf(buffer, sizeof(buffer), msg, args);
va_end(args); va_end(args);
I_Error("%s(%d:%d): %s", s->scriptname, s->state.tokenline, if (type == SC_ERROR)
s->state.tokenlinepos + 1, buffer); {
I_Error("%s(%d:%d): %s", s->scriptname, s->state.tokenline,
s->state.tokenlinepos + 1, buffer);
}
else
{
I_Printf(VB_ERROR, "%s(%d:%d): %s", s->scriptname, s->state.tokenline,
s->state.tokenlinepos + 1, buffer);
}
} }
void SC_MustGetToken(scanner_t *s, char token) void SC_MustGetToken(scanner_t *s, char token)

10
src/m_scanner.h
View File

@ -72,6 +72,14 @@ boolean SC_SameLine(scanner_t *s);
boolean SC_CheckStringOrIdent(scanner_t *s); boolean SC_CheckStringOrIdent(scanner_t *s);
void SC_MustGetStringOrIdent(scanner_t *s); void SC_MustGetStringOrIdent(scanner_t *s);
void SC_Error(scanner_t *s, const char *msg, ...) PRINTF_ATTR(2, 3); typedef enum
{
SC_ERROR,
SC_WARNING
} scmsg_t;
void SC_PrintMsg(scmsg_t type, scanner_t *s, const char *msg, ...) PRINTF_ATTR(3, 4);
#define SC_Error(s, ...) SC_PrintMsg(SC_ERROR, s, __VA_ARGS__)
#define SC_Warning(s, ...) SC_PrintMsg(SC_WARNING, s, __VA_ARGS__)
#endif #endif

13
src/s_sndinfo.c
View File

@ -70,7 +70,9 @@ static void ParseSoundDefinition(scanner_t *s, sound_def_t **sound_defs)
if (!SC_SameLine(s)) if (!SC_SameLine(s))
{ {
SC_Error(s, "expected lump name"); SC_Warning(s, "expected lump name");
free(def.sound_name);
return;
} }
SC_MustGetToken(s, TK_RawString); SC_MustGetToken(s, TK_RawString);
@ -79,7 +81,14 @@ static void ParseSoundDefinition(scanner_t *s, sound_def_t **sound_defs)
if (def.lumpnum < 0) if (def.lumpnum < 0)
{ {
SC_Error(s, "lump not found: %s", def.lump_name); SC_Warning(s, "lump not found: %s", def.lump_name);
free(def.sound_name);
free(def.lump_name);
if (SC_SameLine(s))
{
SC_GetNextLineToken(s);
}
return;
} }
// If there are multiple sound definitions with the same sound name, only // If there are multiple sound definitions with the same sound name, only