ref: 878c374959627474fec914d9ccd33e5a556388a6
parent: 753d2b72a1c2e76fc6f189e50bdc9632904d915d
parent: 03827e669c3ded9f6aaabe1f24eb281f761f7a34
author: Christopher Snowhill <kode54@gmail.com>
date: Wed Sep 13 19:18:14 EDT 2017
Merge pull request #40 from katajakasa/ttv-fix-indents Make gcc -wmisleading-indentation happy
--- a/src/it/itread.c
+++ b/src/it/itread.c
@@ -623,8 +623,8 @@
long n, len, delta;
signed char * ptr, * end;
signed char compression_table[16];
- if (dumbfile_getnc((char *)compression_table, 16, f) != 16)
- return -1;
+ if (dumbfile_getnc((char *)compression_table, 16, f) != 16)
+ return -1;
ptr = (signed char *) sample->data;
delta = 0;
--- a/src/it/readmod.c
+++ b/src/it/readmod.c
@@ -283,15 +283,15 @@
int i;
unsigned long fft;
- if ( dumbfile_seek(f, MOD_FFT_OFFSET, DFS_SEEK_SET) )
- return NULL;
+ if ( dumbfile_seek(f, MOD_FFT_OFFSET, DFS_SEEK_SET) )
+ return NULL;
- fft = dumbfile_mgetl(f);
- if (dumbfile_error(f))
- return NULL;
+ fft = dumbfile_mgetl(f);
+ if (dumbfile_error(f))
+ return NULL;
- if ( dumbfile_seek(f, 0, DFS_SEEK_SET) )
- return NULL;
+ if ( dumbfile_seek(f, 0, DFS_SEEK_SET) )
+ return NULL;
sigdata = malloc(sizeof(*sigdata));
if (!sigdata) {--- a/src/it/readxm.c
+++ b/src/it/readxm.c
@@ -899,15 +899,15 @@
if (sigdata->speed == 0) sigdata->speed = 6; // Should we? What about tempo?
sigdata->tempo = dumbfile_igetw(f);
- // FT2 always clips restart position against the song length
- if (sigdata->restart_position > sigdata->n_orders)
- sigdata->restart_position = sigdata->n_orders;
- // And FT2 starts playback on order 0, regardless of length,
- // and only checks if the next order is greater than or equal
- // to this, not the current pattern. Work around this with
- // DUMB's playback core by overriding a zero length with one.
- if (sigdata->n_orders == 0)
- sigdata->n_orders = 1;
+ // FT2 always clips restart position against the song length
+ if (sigdata->restart_position > sigdata->n_orders)
+ sigdata->restart_position = sigdata->n_orders;
+ // And FT2 starts playback on order 0, regardless of length,
+ // and only checks if the next order is greater than or equal
+ // to this, not the current pattern. Work around this with
+ // DUMB's playback core by overriding a zero length with one.
+ if (sigdata->n_orders == 0)
+ sigdata->n_orders = 1;
/* sanity checks */
// XXX