Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
d8022f8cf8
2 changed files with 3 additions and 3 deletions
|
@ -240,7 +240,7 @@ bool DiskImage::OpenD64(const FILINFO* fileInfo, unsigned char* diskImage, unsig
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: // non-standard images, attempt to load anyway
|
default: // non-standard images, attempt to load anyway
|
||||||
last_track = 40;
|
last_track = MAX_TRACK_D64;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,9 @@
|
||||||
|
|
||||||
/* D64 constants */
|
/* D64 constants */
|
||||||
#define BLOCKSONDISK (17*21 + 7*19 + 6*18 + 5*17)
|
#define BLOCKSONDISK (17*21 + 7*19 + 6*18 + 5*17)
|
||||||
#define BLOCKSEXTRA (5*17)
|
#define BLOCKSEXTRA (5*17 + 2*17)
|
||||||
#define MAXBLOCKSONDISK (BLOCKSONDISK+BLOCKSEXTRA)
|
#define MAXBLOCKSONDISK (BLOCKSONDISK+BLOCKSEXTRA)
|
||||||
#define MAX_TRACK_D64 40
|
#define MAX_TRACK_D64 42
|
||||||
|
|
||||||
/* G64 constants (only needed for current VICE support */
|
/* G64 constants (only needed for current VICE support */
|
||||||
#define G64_TRACK_MAXLEN 7928
|
#define G64_TRACK_MAXLEN 7928
|
||||||
|
|
Loading…
Reference in a new issue