From b4747b7493d99df3ee7afc67aa0c77ecba5638d4 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 29 Nov 2004 06:09:06 +0000 Subject: [PATCH] original prototype in d2src is wrong, I guess --- ChangeLog | 3 +++ arch/sdl/digi.c | 4 ++-- main/digi.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2de9a78..d3f2d058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-11-28 Bradley Bell + * arch/sdl/digi.c, main/digi.h: original prototype in d2src is + wrong, I guess + * arch/sdl/digi.c, arch/win32/midi.c, main/Makefile.am, main/digiobj.c, main/digi.h, main/kludge.c, main/old/digiobj.c: ripped object stuff out of digi.c, now using digiobj.c. get rid of diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c index ebdaa52d..6ed05e21 100644 --- a/arch/sdl/digi.c +++ b/arch/sdl/digi.c @@ -1,4 +1,4 @@ -/* $Id: digi.c,v 1.18 2004-11-29 05:25:58 btb Exp $ */ +/* $Id: digi.c,v 1.19 2004-11-29 06:09:06 btb Exp $ */ /* * * SDL digital audio support @@ -253,7 +253,7 @@ static int get_free_slot() return -1; } -int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int persistent) +int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int soundobj) { int ntries; int slot; diff --git a/main/digi.h b/main/digi.h index 202784ee..639292da 100644 --- a/main/digi.h +++ b/main/digi.h @@ -1,4 +1,4 @@ -/* $Id: digi.h,v 1.5 2004-11-29 05:25:58 btb Exp $ */ +/* $Id: digi.h,v 1.6 2004-11-29 06:09:06 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -109,7 +109,7 @@ extern void digi_stop_sound( int channel ); extern int digi_find_channel(int soundno); // Volume 0-F1_0 -extern int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int persistent); +extern int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int soundobj); // Stops all sounds that are playing void digi_stop_all_channels(); -- 2.39.2