[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [526] trunk/FuseGenerator/ LibspectrumSCRExtractor.m

[<fr...@us...>]

Revision: 526
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=526&view=rev
Author:   fredm
Date:     2008-05-04 03:38:45 -0700 (Sun, 04 May 2008)

Log Message:
-----------
Have inlay images take priority over loading screens.

Modified Paths:
--------------
    trunk/FuseGenerator/LibspectrumSCRExtractor.m

Modified: trunk/FuseGenerator/LibspectrumSCRExtractor.m
===================================================================
--- trunk/FuseGenerator/LibspectrumSCRExtractor.m	2008-05-04 09:11:05 UTC (rev 525)
+++ trunk/FuseGenerator/LibspectrumSCRExtractor.m	2008-05-04 10:38:45 UTC (rev 526)
@@ -210,8 +210,11 @@
     case LIBSPECTRUM_TAPE_BLOCK_ROM:
     case LIBSPECTRUM_TAPE_BLOCK_TURBO:
       /* See if this looks like a standard Spectrum screen and if so
-         display it if we haben't already assigned an image */
-      if( scrData ) continue;
+         display it if we haven't already assigned an image */
+      if( scrData ) {
+        block = libspectrum_tape_iterator_next( &iterator );
+        continue;
+      }
 
       if( seen_scr_header ) {
         // SCREEN$ is 6912 bytes plus flag and checksum
@@ -223,11 +226,9 @@
                                    length:STANDARD_SCR_SIZE];    
 
           image_type = TYPE_SCR;
+        }
 
-          goto done;
-        } else {
-          seen_scr_header = 0;
-        }
+        seen_scr_header = 0;
       } else {
         // Header is 17 bytes plus flag and checksum
         if( libspectrum_tape_block_data_length( block ) == 19 ) {
@@ -245,7 +246,10 @@
     case LIBSPECTRUM_TAPE_BLOCK_CUSTOM:
       {
         char* description = libspectrum_tape_block_text( block );
-        if( !description ) { continue; }
+        if( !description ) {
+          block = libspectrum_tape_iterator_next( &iterator );
+          continue;
+        }
 
         if( !scrData &&
             strncmp( "Spectrum Screen ", description, 0x10 ) == 0 ) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.