Ticket #8493: scummvm.patch

Makefile.common

@@ -96 +96 @@
 MODULES += gob
 endif
 
+ifdef DISABLE_LURE
+DEFINES += -DDISABLE_LURE
+else
+MODULES += lure
+endif
+
 # After the game specific modules follow the shared modules
 MODULES += \
         gui \

base/plugins.cpp

@@ -328 +328 @@
         #ifndef DISABLE_GOB
         LINK_PLUGIN(GOB)
         #endif
+        #ifndef DISABLE_LURE
+        LINK_PLUGIN(LURE)
+        #endif
 
 #endif
 }

configure

@@ -56 +56 @@
 _build_saga=yes
 _build_gob=yes
 _build_kyra=yes
+_build_lure=yes
 _need_memalign=no
 _build_plugins=no
 _nasm=auto
@@ -301 +302 @@
   --disable-saga           don't build the SAGA engine
   --disable-gob            don't build the Gobli*ns engine
   --disable-kyra           don't build the Legend of Kyrandia engine
+  --disable-lure           don't build the Lure of the Temptress engine
   --enable-plugins         build engines as loadable modules instead of
                            static linking them
   --disable-mt32emu        don't enable the integrated MT-32 emulator
@@ -366 +368 @@
       --disable-saga)           _build_saga=no ;;
       --disable-gob)            _build_gob=no ;;
       --disable-kyra)           _build_kyra=no ;;
+      --disable-lure)           _build_lure=no ;;
       --disable-hq-scalers)     _build_hq_scalers=no ;;
       --disable-scalers)        _build_scalers=no ;;
       --enable-alsa)            _alsa=yes       ;;
@@ -677 +680 @@
         _mak_gob='# DISABLE_GOB = 1'
 fi
 
+if test "$_build_lure" = no ; then
+        _mak_lure='DISABLE_LURE = 1'
+else
+        _mak_lure='# DISABLE_LURE = 1'
+fi
+
 if test "$_build_hq_scalers" = no ; then
         _mak_hq_scalers='DISABLE_HQ_SCALERS = 1'
 else
@@ -1242 +1251 @@
 if test "$_build_gob" = yes ; then
         echo "    Gobli*ns"
 fi
+if test "$_build_lure" = yes ; then
+        echo "    Lure of the Temptress"
+fi
 
 echo
 
@@ -1379 +1391 @@
 $_mak_kyra
 $_mak_saga
 $_mak_gob
+$_mak_lure
 $_mak_mt32emu
 
 $_mak_hq_scalers

lure/disk.cpp

@@ -29 +29 @@
 uint8 Disk::indexOf(uint16 id, bool suppressError) {
         // Make sure the correct file is open - the upper two bits of the Id give the file number. Note
         // that an extra check is done for the upper byte of the Id being 0x3f, which is the Id range
-        // I use for disk0.vga resources, which are resources extracted from the lure.exe executable
+        // I use for lure.dat resources, which are resources extracted from the lure.exe executable
         uint8 entryFileNum = ((id>>8) == 0x3f) ? 0 : ((id >> 14) & 3) + 1;
         openFile(entryFileNum);
 
@@ -85 +85 @@
         uint32 headerSize = sizeof(FileEntry) * NUM_ENTRIES_IN_HEADER;
         if (_fileHandle->read(_entries, headerSize) != headerSize)
                 error("The file %s%s had a corrupted header", _gameDataPath.c_str(), sFilename);
+
+#ifdef SCUMM_BIG_ENDIAN
+        // Process the read in header list to convert to big endian
+        for (int i = 0; i < NUM_ENTRIES_IN_HEADER; ++i) {
+                _entries[i].id = FROM_LE_16(_entries[i].id);
+                _entries[i].size = FROM_LE_16(_entries[i].size);
+                _entries[i].offset = FROM_LE_16(_entries[i].offset);
+        }
+#endif
 }
 
 uint32 Disk::getEntrySize(uint16 id) {