diff options
| author | Max Horn | 2009-05-12 23:30:10 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-12 23:30:10 +0000 |
| commit | 0255cd0213a219fba69860200a987a0d837493a0 (patch) | |
| tree | 1dd1ce850fc46e468e1d00a0ed86f5686630b7be /engines/sci/sfx/softseq | |
| parent | 8d8e9d3aaa717616c001083913d0c1e6fff2c580 (diff) | |
| download | scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.tar.gz scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.tar.bz2 scummvm-rg350-0255cd0213a219fba69860200a987a0d837493a0.zip | |
SCI: Removed sci_memory.h/.cpp
svn-id: r40514
Diffstat (limited to 'engines/sci/sfx/softseq')
| -rw-r--r-- | engines/sci/sfx/softseq/amiga.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp index acd9fc444f..11feaebd96 100644 --- a/engines/sci/sfx/softseq/amiga.cpp +++ b/engines/sci/sfx/softseq/amiga.cpp @@ -24,7 +24,6 @@ */ #include "sci/tools.h" -#include "sci/sci_memory.h" #include "sci/sfx/softseq.h" #include "common/file.h" @@ -374,7 +373,7 @@ static instrument_t *read_instrument(Common::File &file, int *id) { return NULL; } - instrument = (instrument_t *) sci_malloc(sizeof(instrument_t)); + instrument = (instrument_t *) malloc(sizeof(instrument_t)); seg_size[0] = read_int16(header + 35) * 2; seg_size[1] = read_int16(header + 41) * 2; @@ -411,7 +410,7 @@ static instrument_t *read_instrument(Common::File &file, int *id) { sciprintf(" Segment sizes: %i %i %i\n", seg_size[0], seg_size[1], seg_size[2]); sciprintf(" Segment offsets: 0 %i %i\n", loop_offset, read_int32(header + 43)); #endif - instrument->samples = (int8 *) sci_malloc(size + 1); + instrument->samples = (int8 *) malloc(size + 1); if (file.read(instrument->samples, size) < (unsigned int)size) { sciprintf("[sfx:seq:amiga] Error: failed to read instrument samples\n"); return NULL; @@ -434,7 +433,7 @@ static instrument_t *read_instrument(Common::File &file, int *id) { instrument->size = seg_size[0]; instrument->loop_size = seg_size[1]; - instrument->loop = (int8*)sci_malloc(instrument->loop_size + 1); + instrument->loop = (int8*)malloc(instrument->loop_size + 1); memcpy(instrument->loop, instrument->samples + loop_offset, instrument->loop_size); instrument->samples[instrument->size] = instrument->loop[0]; |