From 3a33c4c3e05075b8f829d1c9fc0f3537ae656580 Mon Sep 17 00:00:00 2001
From: Denis Molony <dmolony@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:00:37 +1000
Subject: [PATCH] fixed basic bug, text bug

---
 .../applefile/ApplesoftBasicProgram.java      |  1 -
 .../diskbrowser/applefile/BasicTextFile.java  |  9 ++++-----
 .../diskbrowser/wizardry/MazeLevel.java       | 20 +++++++++----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java b/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
index f2048e7..0e2c904 100644
--- a/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
+++ b/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
@@ -364,7 +364,6 @@ public class ApplesoftBasicProgram extends BasicProgram
     if (!c1.equals ("  ") && c2.equals ("  "))
       c2 = "--";
 
-    //    if (basicPreferences.onlyShowTargetLineNumbers && !c2.startsWith (">"))
     if (!isTarget && basicPreferences.onlyShowTargetLineNumbers)
       lineNumberText = "";
 
diff --git a/src/com/bytezone/diskbrowser/applefile/BasicTextFile.java b/src/com/bytezone/diskbrowser/applefile/BasicTextFile.java
index 5613b40..a96f370 100755
--- a/src/com/bytezone/diskbrowser/applefile/BasicTextFile.java
+++ b/src/com/bytezone/diskbrowser/applefile/BasicTextFile.java
@@ -121,6 +121,7 @@ public class BasicTextFile extends TextFile
       text.append ("Text values\n");
       text.append ("-------------------------------------------------------\n");
     }
+
     for (TextBuffer tb : buffers)
     {
       buffer = tb.buffer;
@@ -156,14 +157,12 @@ public class BasicTextFile extends TextFile
       {
         line = line.replaceAll ("\\n", "\n                     ");
         text.append (
-            String.format ("%,10d %,8d  %s%n", recNo * recordLength, recNo++, line));
+            String.format ("%,10d %,8d  %s%n", recNo * recordLength, recNo, line));
       }
       else
-      {
-        line = line.replaceAll ("\\n", "\n                     ");
         text.append (String.format ("%s%n", line));
-        recNo++;
-      }
+
+      recNo++;
     }
 
     return text;
diff --git a/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java b/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java
index 7d830e6..332b8e7 100755
--- a/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java
+++ b/src/com/bytezone/diskbrowser/wizardry/MazeLevel.java
@@ -352,7 +352,7 @@ class MazeLevel extends AbstractFile
         cell.unknown = cellFlag;
         break;
 
-      case 8:
+      case 8:       // buttonz
         cell.elevator = true;
         MazeAddress elevatorAddress = getAddress (b);
         cell.elevatorTo = elevatorAddress.row;
@@ -365,40 +365,40 @@ class MazeLevel extends AbstractFile
         cell.rock = true;
         break;
 
-      case 10:
+      case 10:      // fizzle
         cell.spellsBlocked = true;
         break;
 
-      case 11:
+      case 11:      // screen message
         MazeAddress messageAddress = getAddress (b);
-        //        int messageNum = HexFormatter.intValue (buffer[800 + b * 2], buffer[801 + b * 2]);
+        //   int messageNum = HexFormatter.intValue (buffer[800 + b * 2], buffer[801 + b * 2]);
 
         Message m = getMessage (messageAddress.row);
         if (m != null)
           cell.message = m;
 
         cell.messageType = messageAddress.column;
-        //            HexFormatter.intValue (buffer[832 + b * 2], buffer[833 + b * 2]);
+        //     HexFormatter.intValue (buffer[832 + b * 2], buffer[833 + b * 2]);
 
         int itemID = -1;
 
         if (cell.messageType == 2 && items != null)                 // obtain Item
         {
-          //          itemID = HexFormatter.intValue (buffer[768 + b * 2], buffer[769 + b * 2]);
+          //   itemID = HexFormatter.intValue (buffer[768 + b * 2], buffer[769 + b * 2]);
           itemID = messageAddress.level;
           cell.itemObtained = items.get (itemID);
         }
 
         if (cell.messageType == 5 && items != null)                 // requires Item
         {
-          //          itemID = HexFormatter.intValue (buffer[768 + b * 2], buffer[769 + b * 2]);
+          //  itemID = HexFormatter.intValue (buffer[768 + b * 2], buffer[769 + b * 2]);
           itemID = messageAddress.level;
           cell.itemRequired = items.get (itemID);
         }
 
         if (cell.messageType == 4)
         {
-          //          value = HexFormatter.intValue (buffer[768 + b * 2], buffer[769 + b * 2]);
+          //   value = HexFormatter.intValue (buffer[768 + b * 2], buffer[769 + b * 2]);
           itemID = messageAddress.level;
           if (value <= 100)
           {
@@ -418,9 +418,9 @@ class MazeLevel extends AbstractFile
         }
         break;
 
-      case 12:
+      case 12:      // encounter
         MazeAddress monsterAddress = getAddress (b);
-        //        cell.monsterID = HexFormatter.intValue (buffer[832 + b * 2], buffer[833 + b * 2]);
+        //  cell.monsterID = HexFormatter.intValue (buffer[832 + b * 2], buffer[833 + b * 2]);
         cell.monsterID = monsterAddress.column;
         cell.monsters = monsters;
         break;