ref: b11657eafe8b4bb60b6d91e46ae77a1966e8d79a
parent: 5bbd401a5552722fb706eec2add6c5bb3a91f2bd
author: Simon Howard <[email protected]>
date: Sun Jan 22 16:20:20 EST 2006
Dehacked string replacements for sound and music lump names Subversion-branch: /trunk/chocolate-doom Subversion-revision: 318
--- 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 @@
#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 @@
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);
}
//
--- 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 @@
#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 @@
// 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);
}