*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@472 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-05 17:41:27 +00:00
parent 7d429be232
commit 1802cace77
35 changed files with 960 additions and 620 deletions
+4 -4
View File
@@ -94,8 +94,8 @@ void music(char *name)
if(soundvol && musicvol)
{
string sn;
strcpy_s(sn, "packages/audio/songs/");
strcat_s(sn, name);
s_strcpy(sn, "packages/audio/songs/");
s_strcat(sn, name);
#ifdef USE_MIXER
if(mod = Mix_LoadMUS(path(sn)))
{
@@ -182,7 +182,7 @@ void updatechanvol(int chan, vec *loc)
void newsoundloc(int chan, vec *loc)
{
assert(chan>=0 && chan<MAXCHAN);
ASSERT(chan>=0 && chan<MAXCHAN);
soundlocs[chan].loc = *loc;
soundlocs[chan].inuse = true;
};
@@ -225,7 +225,7 @@ void playsound(int n, vec *loc)
if(!samples[n])
{
sprintf_sd(buf)("packages/audio/sounds/%s.wav", snames[n]);
s_sprintfd(buf)("packages/audio/sounds/%s.wav", snames[n]);
#ifdef USE_MIXER
samples[n] = Mix_LoadWAV(path(buf));