diff options
| author | Simon Howard | 2006-01-22 21:20:20 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-01-22 21:20:20 +0000 |
| commit | b11657eafe8b4bb60b6d91e46ae77a1966e8d79a (patch) | |
| tree | 81a8a53f56538a92379f273a0c1523811fccb862 | |
| parent | 5bbd401a5552722fb706eec2add6c5bb3a91f2bd (diff) | |
| download | chocolate-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
| -rw-r--r-- | src/i_sound.c | 10 | ||||
| -rw-r--r-- | src/s_sound.c | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/i_sound.c b/src/i_sound.c index 18cc0975..37e3ac9e 100644 --- a/src/i_sound.c +++ b/src/i_sound.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: i_sound.c 280 2006-01-10 22:14:13Z fraggle $ +// $Id: i_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.26 2006/01/22 21:20:20 fraggle +// Dehacked string replacements for sound and music lump names +// // Revision 1.25 2006/01/10 22:14:13 fraggle // Shut up compiler warnings // @@ -122,7 +125,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: i_sound.c 280 2006-01-10 22:14:13Z fraggle $"; +rcsid[] = "$Id: i_sound.c 318 2006-01-22 21:20:20Z fraggle $"; #include <stdio.h> #include <stdlib.h> @@ -138,6 +141,7 @@ rcsid[] = "$Id: i_sound.c 280 2006-01-10 22:14:13Z fraggle $"; #include "i_system.h" #include "i_sound.h" +#include "deh_main.h" #include "m_argv.h" #include "m_misc.h" #include "m_swap.h" @@ -353,7 +357,7 @@ void I_SetSfxVolume(int volume) int I_GetSfxLumpNum(sfxinfo_t* sfx) { char namebuf[9]; - sprintf(namebuf, "ds%s", sfx->name); + sprintf(namebuf, "ds%s", DEH_String(sfx->name)); return W_GetNumForName(namebuf); } // 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); } |