From 27dbc373637e13c2280dc7eaab52153101ed3899 Mon Sep 17 00:00:00 2001
From: sbkelley <sb24kelley@gmail.com>
Date: Sat, 6 Jun 2026 03:19:35 -0400
Subject: [PATCH] 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)
---
 Changelog     | 6 ++++++
 dgamelaunch.c | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index ce3ff67..b1ca1be 100644
--- 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 de9dc49..33136ee 100644
--- 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';
-- 
2.47.3