thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: More cleanup

Browse source 
svn-id: r38758
This commit is contained in:
Max Horn 2009-02-21 22:40:58 +00:00
parent 41b1f19a5d
commit d6e397233f
11 changed files with 30 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/sci/sfx/iterator.cpp
View file

@ -48,9 +48,7 @@ void print_tabs_id(int nr, songit_id_t id) {
fprintf(stderr, "[%08lx] ", id);
}
#ifndef HAVE_MEMCHR
static void *
memchr(void *_data, int c, int n) {
static unsigned char *sci_memchr(void *_data, int c, int n) {
unsigned char *data = (unsigned char *) _data;
while (n && !(*data == c)) {
@ -63,7 +61,6 @@ memchr(void *_data, int c, int n) {
else
return NULL;
}
#endif
static void _common_init(base_song_iterator_t *self) {
self->fade.action = FADE_ACTION_NONE;
@ -491,7 +488,7 @@ static int _sci0_get_pcm_data(sci0_song_iterator_t *self,
while ((tries--) && (offset < self->size) && (!found_it)) {
/* Search through the garbage manually */
unsigned char *fc = (unsigned char*)memchr(self->data + offset,
unsigned char *fc = sci_memchr(self->data + offset,
SCI0_END_OF_SONG,
self->size - offset);