[Scummvm-cvs-logs] SF.net SVN: scummvm:[51576] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 51576
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51576&view=rev
Author:   m_kiewitz
Date:     2010-08-01 12:38:07 +0000 (Sun, 01 Aug 2010)

Log Message:
-----------
SCI: removing pirated sq4 version from detection

"fixes" bug #3037800
fixing warning in seg_manager

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection_tables.h
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/detection_tables.h
===================================================================
--- scummvm/trunk/engines/sci/detection_tables.h	2010-08-01 12:00:36 UTC (rev 51575)
+++ scummvm/trunk/engines/sci/detection_tables.h	2010-08-01 12:38:07 UTC (rev 51576)
@@ -2831,7 +2831,8 @@
 		Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH
 	},
 
-	// Space Quest 4 - English DOS
+#if 0
+	// Space Quest 4 - English DOS - THIS VERSION IS PIRATED/CRACKED AND REPACKAGED =DO NOT RE-ADD=
 	// Executable scanning reports "1.000.753"
 	// SCI interpreter version 1.000.200 (just a guess)
 	{"sq4", "", {
@@ -2840,6 +2841,7 @@
 		{NULL, 0, NULL, 0}},
 		Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH
 	},
+#endif
 
 	// Space Quest 4 - English DOS
 	// Executable scanning reports "1.000.753"

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-08-01 12:00:36 UTC (rev 51575)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-08-01 12:38:07 UTC (rev 51576)
@@ -852,7 +852,6 @@
 }
 
 bool SegManager::freeDynmem(reg_t addr) {
-	SegmentType foo = _heap[addr.segment]->getType();
 	if (addr.segment < 1 || addr.segment >= _heap.size() || !_heap[addr.segment] || _heap[addr.segment]->getType() != SEG_TYPE_DYNMEM)
 		return false; // error
 


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