diff options
Diffstat (limited to 'apps/plugins/mikmod/load_okt.c')
-rw-r--r-- | apps/plugins/mikmod/load_okt.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/apps/plugins/mikmod/load_okt.c b/apps/plugins/mikmod/load_okt.c index 6a40b5fe03..a0eee7f56e 100644 --- a/apps/plugins/mikmod/load_okt.c +++ b/apps/plugins/mikmod/load_okt.c | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /*============================================================================== | 21 | /*============================================================================== |
22 | 22 | ||
23 | $Id: load_okt.c,v 1.3 2005/04/07 19:57:38 realtech Exp $ | 23 | $Id$ |
24 | 24 | ||
25 | Oktalyzer (OKT) module loader | 25 | Oktalyzer (OKT) module loader |
26 | 26 | ||
@@ -203,7 +203,7 @@ static int OKT_doSAMP(int len) | |||
203 | s.len = _mm_read_M_ULONG(modreader); | 203 | s.len = _mm_read_M_ULONG(modreader); |
204 | s.loopbeg = _mm_read_M_UWORD(modreader) * 2; | 204 | s.loopbeg = _mm_read_M_UWORD(modreader) * 2; |
205 | s.looplen = _mm_read_M_UWORD(modreader) * 2; | 205 | s.looplen = _mm_read_M_UWORD(modreader) * 2; |
206 | (void)_mm_read_UBYTE(modreader); | 206 | _mm_skip_BYTE(modreader); |
207 | s.volume = _mm_read_UBYTE(modreader); | 207 | s.volume = _mm_read_UBYTE(modreader); |
208 | _mm_read_M_UWORD(modreader); | 208 | _mm_read_M_UWORD(modreader); |
209 | 209 | ||
@@ -314,6 +314,7 @@ static int OKT_doPBOD(int patnum) | |||
314 | } | 314 | } |
315 | MikMod_free(patbuf); | 315 | MikMod_free(patbuf); |
316 | MikMod_free(okttrk); | 316 | MikMod_free(okttrk); |
317 | okttrk = NULL; | ||
317 | return 1; | 318 | return 1; |
318 | } | 319 | } |
319 | 320 | ||
@@ -330,28 +331,28 @@ static int OKT_Load(int curious) | |||
330 | int seen_cmod = 0, seen_samp = 0, seen_slen = 0, seen_plen = 0, seen_patt | 331 | int seen_cmod = 0, seen_samp = 0, seen_slen = 0, seen_plen = 0, seen_patt |
331 | = 0, seen_spee = 0; | 332 | = 0, seen_spee = 0; |
332 | int patnum = 0, insnum = 0; | 333 | int patnum = 0, insnum = 0; |
333 | (void)curious; | 334 | (void)curious; |
334 | 335 | ||
335 | /* skip OKTALYZER header */ | 336 | /* skip OKTALYZER header */ |
336 | _mm_fseek(modreader, 8, SEEK_SET); | 337 | _mm_fseek(modreader, 8, SEEK_SET); |
337 | of.songname = StrDup(""); | 338 | of.songname = MikMod_strdup(""); |
338 | 339 | ||
339 | of.modtype = StrDup("Amiga Oktalyzer"); | 340 | of.modtype = MikMod_strdup("Amiga Oktalyzer"); |
340 | of.numpos = of.reppos = 0; | 341 | of.numpos = of.reppos = 0; |
341 | 342 | ||
342 | /* default values */ | 343 | /* default values */ |
343 | of.initspeed = 6; | 344 | of.initspeed = 6; |
344 | of.inittempo = 125; | 345 | of.inittempo = 125; |
345 | 346 | ||
346 | while (1) { | 347 | while (1) { |
347 | /* read block header */ | 348 | /* read block header */ |
348 | _mm_read_UBYTES(id, 4, modreader); | 349 | _mm_read_UBYTES(id, 4, modreader); |
349 | len = _mm_read_M_ULONG(modreader); | 350 | len = _mm_read_M_ULONG(modreader); |
350 | 351 | ||
351 | if (_mm_eof(modreader)) | 352 | if (_mm_eof(modreader)) |
352 | break; | 353 | break; |
353 | fp = _mm_ftell(modreader); | 354 | fp = _mm_ftell(modreader); |
354 | 355 | ||
355 | if (!memcmp(id, "CMOD", 4)) { | 356 | if (!memcmp(id, "CMOD", 4)) { |
356 | if (!seen_cmod) { | 357 | if (!seen_cmod) { |
357 | OKT_doCMOD(); | 358 | OKT_doCMOD(); |
@@ -442,7 +443,7 @@ static int OKT_Load(int curious) | |||
442 | 443 | ||
443 | static CHAR *OKT_LoadTitle(void) | 444 | static CHAR *OKT_LoadTitle(void) |
444 | { | 445 | { |
445 | return StrDup(""); | 446 | return MikMod_strdup(""); |
446 | } | 447 | } |
447 | 448 | ||
448 | /*========== Loader information */ | 449 | /*========== Loader information */ |