]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'packer/fix_team_chat_beep' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 11 Jan 2016 00:23:37 +0000 (00:23 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 11 Jan 2016 00:23:37 +0000 (00:23 +0000)
fix team chat beep sound

There are two beep sounds :
* General chat and (**talk.wav**)
* team messages (**talk2.wav**)

These should not be converted to **ogg**, otherwise the engine does not find **talk2.wav**.

See: https://gitlab.com/xonotic/darkplaces/blob/div0-stable/cl_parse.c#L517

This causes that the beep sound for general chat is used for team messages, too.

The script *cached_converter.sh* already tries excludes them (But uses wrong path.)

See merge request !15

misc/tools/cached-converter.sh

index 191e208660af9c9fef55f3b9c2fa8b7ba3fe82dd..84f3480db11917b8066c8ad603303a9195b2a3ed 100755 (executable)
@@ -380,7 +380,7 @@ for F in "$@"; do
                esac
        fi
        case "$f" in
-               ./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
+               ./sound/misc/talk*.wav) will_ogg=false ;; # engine "feature"
                *_bump) will_dds=false ;;
                ./models/player/*) will_dds=false ;;
                ./models/sprites/*) will_dds=false ;;