projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020313-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.c
diff --git
a/src/libgame/sound.c
b/src/libgame/sound.c
index f0aa106ac273ec0d73096f1b402778aeaa54d518..d97a4255664f7f83a8a1512b763fd0ce9d6285a2 100644
(file)
--- a/
src/libgame/sound.c
+++ b/
src/libgame/sound.c
@@
-871,7
+871,7
@@
static boolean LoadSoundExt(char *sound_name, boolean is_music)
#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS)
byte sound_header_buffer[WAV_HEADER_SIZE];
char chunk[CHUNK_ID_LEN + 1];
#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS)
byte sound_header_buffer[WAV_HEADER_SIZE];
char chunk[CHUNK_ID_LEN + 1];
- int chunk_
length
, dummy;
+ int chunk_
size
, dummy;
FILE *file;
int i;
#endif
FILE *file;
int i;
#endif
@@
-905,7
+905,7
@@
static boolean LoadSoundExt(char *sound_name, boolean is_music)
}
/* read chunk "RIFF" */
}
/* read chunk "RIFF" */
- getFileChunk(file, chunk, &chunk_
length
, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunk(file, chunk, &chunk_
size
, BYTE_ORDER_LITTLE_ENDIAN);
if (strcmp(chunk, "RIFF") != 0)
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
if (strcmp(chunk, "RIFF") != 0)
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
@@
-927,7
+927,7
@@
static boolean LoadSoundExt(char *sound_name, boolean is_music)
sound_header_buffer[i] = fgetc(file);
/* read chunk "data" */
sound_header_buffer[i] = fgetc(file);
/* read chunk "data" */
- getFileChunk(file, chunk, &chunk_
length
, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunk(file, chunk, &chunk_
size
, BYTE_ORDER_LITTLE_ENDIAN);
if (strcmp(chunk, "data") != 0)
{
Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
if (strcmp(chunk, "data") != 0)
{
Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
@@
-935,7
+935,7
@@
static boolean LoadSoundExt(char *sound_name, boolean is_music)
return FALSE;
}
return FALSE;
}
- snd_info->data_len = chunk_
length
;
+ snd_info->data_len = chunk_
size
;
snd_info->data_ptr = checked_malloc(snd_info->data_len);
/* read sound data */
snd_info->data_ptr = checked_malloc(snd_info->data_len);
/* read sound data */