nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

When setting user sounds, allow also setting a MSGTYPE

Browse Source 
The SOUND lines now have an optional msgtype parameter:

   SOUND=MESG hide "^You miss the " "swing.wav" 75

Fixes #571
This commit is contained in:
Pasi Kallinen
2022-04-27 13:31:28 +03:00
parent 5d20140b74
commit c3c60b0b2c
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sounds.c
View File

@@ -1422,12 +1422,18 @@ add_sound_mapping(const char* mapping)
char text[256];
char filename[256];
char filespec[256];
char msgtyp[11];
int volume, idx = -1;
if (sscanf(mapping, "MESG \"%255[^\"]\"%*[\t ]\"%255[^\"]\" %d %d", text,
filename, &volume, &idx) == 4
|| sscanf(mapping, "MESG \"%255[^\"]\"%*[\t ]\"%255[^\"]\" %d", text,
filename, &volume) == 3) {
msgtyp[0] = '\0';
if (sscanf(mapping, "MESG \"%255[^\"]\"%*[\t ]\"%255[^\"]\" %d %d",
text, filename, &volume, &idx) == 4
|| sscanf(mapping, "MESG %10[^\"] \"%255[^\"]\"%*[\t ]\"%255[^\"]\" %d %d",
msgtyp, text, filename, &volume, &idx) == 5
|| sscanf(mapping, "MESG %10[^\"] \"%255[^\"]\"%*[\t ]\"%255[^\"]\" %d",
msgtyp, text, filename, &volume) == 4
|| sscanf(mapping, "MESG \"%255[^\"]\"%*[\t ]\"%255[^\"]\" %d",
text, filename, &volume) == 3) {
audio_mapping *new_map;
if (!sounddir)
@@ -1455,6 +1461,12 @@ add_sound_mapping(const char* mapping)
raw_print(re_error_desc);
return 0;
} else {
if (*msgtyp) {
char tmpbuf[BUFSZ];
Sprintf(tmpbuf, "%.10s \"%.230s\"", msgtyp, text);
(void) msgtype_parse_add(tmpbuf);
}
soundmap = new_map;
}
} else {