changeset 98:82b825bb08b0

Fix XM loading. Oops.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 02 Oct 2012 20:25:04 +0300
parents 2884a611042b
children 7a59611f9d4f
files jloadxm.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jloadxm.c	Tue Oct 02 20:18:39 2012 +0300
+++ b/jloadxm.c	Tue Oct 02 20:25:04 2012 +0300
@@ -355,7 +355,7 @@
         remainder = xmI1.headSize - (dmftell(inFile) - pos);
         if (remainder > 0)
         {
-            JSSDEBUG("Skipping: %li\n", remainder);
+            JSSDEBUG("xmI1#1 Skipping: %li\n", remainder);
             dmfseek(inFile, remainder, SEEK_CUR);
         }
 
@@ -581,7 +581,7 @@
         remainder = xmI1.headSize - (dmftell(inFile) - pos);
         if (remainder > 0)
         {
-            JSSDEBUG("Skipping: %li\n", remainder);
+            JSSDEBUG("xmI1#2 Skipping: %li\n", remainder);
             dmfseek(inFile, remainder, SEEK_CUR);
         }
     }
@@ -726,11 +726,11 @@
         XMPattern xmP;
 
         // Get the pattern header
+        pos = dmftell(inFile);
         dmf_read_le32(inFile, &xmP.headSize);
         xmP.packing = dmfgetc(inFile);
         dmf_read_le16(inFile, &xmP.nrows);
         dmf_read_le16(inFile, &xmP.size);
-        pos = dmftell(inFile);
 
         // Check the header
         if (xmP.packing != 0)
@@ -760,7 +760,7 @@
         remainder = xmP.headSize - (dmftell(inFile) - pos);
         if (remainder > 0)
         {
-            JSSDEBUG("Skipping: %li\n", remainder);
+            JSSDEBUG("xmP Skipping: %li\n", remainder);
             dmfseek(inFile, remainder, SEEK_CUR);
         }
     }