summaryrefslogtreecommitdiff
path: root/src/s_sound.c
diff options
context:
space:
mode:
authorSimon Howard2006-01-22 21:20:20 +0000
committerSimon Howard2006-01-22 21:20:20 +0000
commitb11657eafe8b4bb60b6d91e46ae77a1966e8d79a (patch)
tree81a8a53f56538a92379f273a0c1523811fccb862 /src/s_sound.c
parent5bbd401a5552722fb706eec2add6c5bb3a91f2bd (diff)
downloadchocolate-doom-b11657eafe8b4bb60b6d91e46ae77a1966e8d79a.tar.gz
chocolate-doom-b11657eafe8b4bb60b6d91e46ae77a1966e8d79a.tar.bz2
chocolate-doom-b11657eafe8b4bb60b6d91e46ae77a1966e8d79a.zip
Dehacked string replacements for sound and music lump names
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 318
Diffstat (limited to 'src/s_sound.c')
-rw-r--r--src/s_sound.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/s_sound.c b/src/s_sound.c
index 7e95cb44..eba7c84e 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: s_sound.c 271 2006-01-08 17:51:53Z fraggle $
+// $Id: s_sound.c 318 2006-01-22 21:20:20Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.11 2006/01/22 21:20:20 fraggle
+// Dehacked string replacements for sound and music lump names
+//
// Revision 1.10 2006/01/08 17:51:53 fraggle
// Add S_MusicPlaying function to query if music is still playing.
//
@@ -64,7 +67,7 @@
static const char
-rcsid[] = "$Id: s_sound.c 271 2006-01-08 17:51:53Z fraggle $";
+rcsid[] = "$Id: s_sound.c 318 2006-01-22 21:20:20Z fraggle $";
@@ -76,6 +79,7 @@ rcsid[] = "$Id: s_sound.c 271 2006-01-08 17:51:53Z fraggle $";
#include "sounds.h"
#include "s_sound.h"
+#include "deh_main.h"
#include "z_zone.h"
#include "m_random.h"
#include "w_wad.h"
@@ -698,7 +702,7 @@ S_ChangeMusic
// get lumpnum if neccessary
if (!music->lumpnum)
{
- sprintf(namebuf, "d_%s", music->name);
+ sprintf(namebuf, "d_%s", DEH_String(music->name));
music->lumpnum = W_GetNumForName(namebuf);
}