From 1cd9ca4c09a0e744829b3edb127feb1abd41d35c Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Sat, 4 Jul 2020 11:30:11 -0500 Subject: [PATCH] Version bump for last commit. Now at v2.0.16. --- direct.c | 6 +++++- version.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/direct.c b/direct.c index 9070a41..e022398 100644 --- a/direct.c +++ b/direct.c @@ -559,7 +559,7 @@ int d_noclear(void) // -// Include binary file +// Include binary file (can add addition size & position params, comma separated) // int d_incbin(void) { @@ -586,6 +586,7 @@ int d_incbin(void) // failed) try list of include files passed in the enviroment string or by // the "-d" option. TOKEN filename = tok[1]; + if ((fd = open(string[filename], _OPEN_INC)) < 0) { for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++) @@ -608,6 +609,7 @@ int d_incbin(void) allright: tok += 2; + if (*tok != EOL) { // Check size parameter (can be omitted) @@ -637,6 +639,7 @@ allright: close(fd); return ERROR; } + lseek(fd, pos, SEEK_SET); size -= pos; } @@ -658,6 +661,7 @@ allright: size = lseek(fd, 0L, SEEK_END); pos = lseek(fd, 0L, SEEK_SET); } + chcheck(size); DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[filename], size); } diff --git a/version.h b/version.h index 084a071..452a865 100644 --- a/version.h +++ b/version.h @@ -15,7 +15,7 @@ #define MAJOR 2 // Major version number #define MINOR 0 // Minor version number -#define PATCH 15 // Patch release number +#define PATCH 16 // Patch release number #endif // __VERSION_H__ -- 2.37.2