diff options
| author | Simon Howard | 2012-12-24 00:03:41 +0000 |
|---|---|---|
| committer | Simon Howard | 2012-12-24 00:03:41 +0000 |
| commit | f1934e990d7c6d8034650fa09b8a175b542330ba (patch) | |
| tree | 2f7a6c1079f98ab9f3a54a6d6354fc7675e4c39e /src/doom/s_sound.c | |
| parent | ea5b5f171623740a74f1b2bef80527c044373502 (diff) | |
| parent | adbfa3216cf3ef6f71cc5b6b22c25a04ae737212 (diff) | |
| download | chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.tar.gz chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.tar.bz2 chocolate-doom-f1934e990d7c6d8034650fa09b8a175b542330ba.zip | |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2553
Diffstat (limited to 'src/doom/s_sound.c')
| -rw-r--r-- | src/doom/s_sound.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/doom/s_sound.c b/src/doom/s_sound.c index 7f4411dd..12a55d8f 100644 --- a/src/doom/s_sound.c +++ b/src/doom/s_sound.c @@ -404,7 +404,6 @@ void S_StartSound(void *origin_p, int sfx_id) mobj_t *origin; int rc; int sep; - int priority; int cnum; int volume; @@ -422,7 +421,6 @@ void S_StartSound(void *origin_p, int sfx_id) // Initialize sound parameters if (sfx->link) { - priority = sfx->priority; volume += sfx->volume; if (volume < 1) @@ -434,10 +432,6 @@ void S_StartSound(void *origin_p, int sfx_id) { volume = snd_SfxVolume; } - } - else - { - priority = NORM_PRIORITY; } |