You can put $INCLUDE anywhere in a line

* altered loadbanner()
* * added `char *inclpos`, position of "$INCLUDE("
* * assign *fn = *inclpos + 9
* updated Changelog

(cherry picked from commit 1df39ee36b2bb13842ea6be27431f674d6d7a3a9)

diff --git a/Changelog b/Changelog
index ce3ff67e59676adb7a7a140cc33c84fd0e216bd7..b1ca1bee2928d4b243428d476e349642386f212b 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+1.6.1-roc (2026)
+    * Forked noisytoot repository and merged changes in paxed's repo since
+         last merge.
+       * Changed loadbanner() [dgamelaunch.c] -- $INCLUDE() can now be anywhere
+         in a line.
+       
 1.6.0-hdf (2018-2020)
        * Enhanced watchmode - use game's built-in whatch function instead of
          ttyplay, when available (FIQ/Tangles)

diff --git a/dgamelaunch.c b/dgamelaunch.c
index de9dc4980d13eb6aa759c573504e67f958d7fc0e..33136eed9d2ca3ce27413b631594f64910a5ba7e 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -596,6 +596,7 @@ loadbanner (char *fname, struct dg_banner *ban) {
   while (fgets (buf, DGL_BANNER_LINELEN, bannerfile) != NULL) {
     char bufnew[DGL_BANNER_LINELEN+1];
     int slen;
+    char *inclpos;
 
     memset (bufnew, 0, DGL_BANNER_LINELEN);
 
@@ -604,8 +605,8 @@ loadbanner (char *fname, struct dg_banner *ban) {
       buf[slen-1] = '\0';
 
     strncpy(bufnew, buf, DGL_BANNER_LINELEN);
-    if (strstr(bufnew, "$INCLUDE(")) {
-      char *fn = bufnew + 9;
+    if ( inclpos = strstr(bufnew, "$INCLUDE(") ) {
+      char *fn = inclpos + 9;
       char *fn_end = strchr(fn, ')');
       if (fn_end) {
         *fn_end = '\0';