diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2009-12-19 18:21:32 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2009-12-19 18:21:32 +0100 |
| commit | 3f906d38e39a061f778effbeaf81e9fe43097b0c (patch) | |
| tree | cb454127679c2abcceb577479166047eb9e72e0a /dumb | |
| parent | f3bb6fe5fbf411604fa19e7430b6753d2bdb0d1c (diff) | |
dumb no longer loads S3Ms with adlib samples
Diffstat (limited to 'dumb')
| -rw-r--r-- | dumb/dumb-kode54/src/it/reads3m.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dumb/dumb-kode54/src/it/reads3m.c b/dumb/dumb-kode54/src/it/reads3m.c index 283becb1..0dac8331 100644 --- a/dumb/dumb-kode54/src/it/reads3m.c +++ b/dumb/dumb-kode54/src/it/reads3m.c @@ -61,7 +61,7 @@ static int it_s3m_read_sample_header(IT_SAMPLE *sample, long *offset, unsigned c sample->name[28] = 0;
dumbfile_skip(f, 4);
sample->flags &= ~IT_SAMPLE_EXISTS;
- return dumbfile_error(f);
+ return -1; // return error so that another plugin could pick that file up
}
*offset = dumbfile_getc(f) << 20;
@@ -730,12 +730,15 @@ static DUMB_IT_SIGDATA *it_s3m_load_sigdata(DUMBFILE *f, int * cwtv) break;
case S3M_COMPONENT_SAMPLE:
- if (it_s3m_read_sample_header(&sigdata->sample[component[n].n], &offset, &sample_pack[component[n].n], *cwtv, f)) {
+ {
+ int err = it_s3m_read_sample_header(&sigdata->sample[component[n].n], &offset, &sample_pack[component[n].n], *cwtv, f);
+ if (err) {
free(buffer);
free(component);
_dumb_it_unload_sigdata(sigdata);
return NULL;
}
+ }
if (sigdata->sample[component[n].n].flags & IT_SAMPLE_EXISTS) {
short *sample;
|