corrected use of the need_decode flag, added support for -a option with '--nokod'

1 files changed, 12 insertions, 8 deletions

diff --git a/crodump.py b/crodump.py
index f50f45b..46fd969 100644
--- a/crodump.py
+++ b/crodump.py
@@ -83,12 +83,12 @@ class Datafile:
             return kodecode(idx, encdat)
 
 
-    def dump(self, args, nodecode=False):
+    def dump(self, args):
         print("tadhdr: %08x %08x" % tuple(self.tadhdr))
         ranges = []  # keep track of used bytes in the .dat file.
         for i, (ofs, ln, chk) in enumerate(self.tadidx):
             if ln==0xFFFFFFFF:
-                print("%5d: %08x %08x %08x" % (i, ofs, ln, chk))
+                print("%5d: %08x %08x %08x" % (i+1, ofs, ln, chk))
                 continue
             flags = ln>>24
 
@@ -102,7 +102,7 @@ class Datafile:
             if not dat:
                 # empty record
                 encdat = dat
-            elif not nodecode and not flags:
+            elif self.need_decode and not flags:
                 extofs, extlen = struct.unpack("<LL", dat[:8])
                 infostr = "%08x;%08x" % (extofs, extlen)
                 encdat = dat[8:]
@@ -119,13 +119,13 @@ class Datafile:
                 encdat = dat
                 decflag = '*'
 
-            if nodecode:
+            if self.need_decode:
+                decdat = kodecode(i+1, encdat)
+            else:
                 decdat = encdat
                 decflag = ' '
-            else:
-                decdat = kodecode(i+1, encdat)
 
-            print("%5d: %08x-%08x: (%02x:%08x) %s %s%s %s" % (i, ofs, ofs+ln, flags, chk, infostr, decflag, toout(args, decdat), tohex(tail)))
+            print("%5d: %08x-%08x: (%02x:%08x) %s %s%s %s" % (i+1, ofs, ofs+ln, flags, chk, infostr, decflag, toout(args, decdat), tohex(tail)))
 
         if args.verbose:
             # output parts not referenced in the .tad file.
@@ -195,7 +195,11 @@ def decode_kod(args, data):
     """
     if args.nokod:
         # plain hexdump, no KOD decode
-        hexdump(args.offset, data)
+        if args.ascdump:
+            print(asasc(data))
+        else:
+            hexdump(args.offset, data)
+
     elif args.shift:
         # explicitly specified shift.
         args.shift = int(args.shift, 0)