From c192c015a589f6f0b871023131de3ba96034266a Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 5 Sep 2016 22:03:33 +0200 Subject: [PATCH] Version now part of the 86F struct, should fix compile. --- src/disc_86f.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/disc_86f.c b/src/disc_86f.c index 74c4cafaf..0be409ea7 100644 --- a/src/disc_86f.c +++ b/src/disc_86f.c @@ -62,6 +62,7 @@ typedef union static struct { FILE *f; + uint16_t version; uint8_t disk_flags; uint8_t track_data[2][50000]; uint8_t track_layout[2][50000]; @@ -201,7 +202,6 @@ void d86f_load(int drive, char *fn) { uint32_t magic = 0; uint32_t len = 0; - uint16_t version = 0; int i = 0; int j = 0; @@ -238,18 +238,18 @@ void d86f_load(int drive, char *fn) return; } - fread(&version, 2, 1, d86f[drive].f); + fread(&(d86f[drive].version), 2, 1, d86f[drive].f); - if ((version != 0x0100) && (version != 0x010A)) + if ((d86f[drive].version != 0x0100) && (d86f[drive].version != 0x010A)) { /* File is not of a recognized format version abort. */ - pclog("86F: Unrecognized file version: %i.%02i\n", version >> 8, version & 0xFF); + pclog("86F: Unrecognized file version: %i.%02i\n", d86f[drive].version >> 8, d86f[drive].version & 0xFF); fclose(d86f[drive].f); return; } else { - pclog("86F: Recognized file version: %i.%02i\n", version >> 8, version & 0xFF); + pclog("86F: Recognized file version: %i.%02i\n", d86f[drive].version >> 8, d86f[drive].version & 0xFF); } fread(&(d86f[drive].disk_flags), 1, 1, d86f[drive].f);