X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fsound.c;h=3f150101c4d9dfec8ca4015d525039b8fc96cab0;hb=c56ae03b51200429cfa20db7d61cfe907dc2e26e;hp=b3818acb722fa9f8d1d1ebe24ffd71a9a3c8c5ad;hpb=19e168a132d1c0543a13cbf9495f579c137dea94;p=rocksndiamonds.git diff --git a/src/sound.c b/src/sound.c index b3818acb..3f150101 100644 --- a/src/sound.c +++ b/src/sound.c @@ -610,6 +610,7 @@ int ulaw_to_linear(unsigned char ulawbyte) /*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/ +#ifndef MSDOS static unsigned long be2long(unsigned long *be) /* big-endian -> longword */ { unsigned char *ptr = (unsigned char *)be; @@ -623,14 +624,17 @@ static unsigned long le2long(unsigned long *be) /* little-endian -> longword */ return(ptr[3]<<24 | ptr[2]<<16 | ptr[1]<<8 | ptr[0]); } +#endif /* !MSDOS */ boolean LoadSound(struct SoundInfo *snd_info) { FILE *file; char filename[256]; char *sound_ext = "wav"; +#ifndef MSDOS struct SoundHeader_WAV *sound_header; int i; +#endif sprintf(filename, "%s/%s/%s.%s", options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext); @@ -683,7 +687,7 @@ boolean LoadSound(struct SoundInfo *snd_info) for (i=0; idata_len; i++) snd_info->data_ptr[i] = snd_info->data_ptr[i]^0x80; -#else +#else /* MSDOS */ snd_info->sample_ptr = load_sample(filename); if (!snd_info->sample_ptr) @@ -702,12 +706,12 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info) FILE *file; char filename[256]; #ifndef MSDOS + struct SoundHeader_8SVX *sound_header; + unsigned char *ptr; char *sound_ext = "8svx"; #else char *sound_ext = "wav"; #endif - struct SoundHeader_8SVX *sound_header; - unsigned char *ptr; sprintf(filename, "%s/%s/%s.%s", options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);