diff options
author | Martin Kiewitz | 2010-08-01 12:38:07 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-08-01 12:38:07 +0000 |
commit | 83e51b0e92b401fb117d40d9eaaf2cafe30ecbd2 (patch) | |
tree | f7b13b655142013c1dc8350af3705c0935fc0470 | |
parent | b0889cfd016e3e1f34466357384c2197366397cd (diff) | |
download | scummvm-rg350-83e51b0e92b401fb117d40d9eaaf2cafe30ecbd2.tar.gz scummvm-rg350-83e51b0e92b401fb117d40d9eaaf2cafe30ecbd2.tar.bz2 scummvm-rg350-83e51b0e92b401fb117d40d9eaaf2cafe30ecbd2.zip |
SCI: removing pirated sq4 version from detection
"fixes" bug #3037800
fixing warning in seg_manager
svn-id: r51576
-rw-r--r-- | engines/sci/detection_tables.h | 4 | ||||
-rw-r--r-- | engines/sci/engine/seg_manager.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 21c9ad826c..e916d1341f 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -2831,7 +2831,8 @@ static const struct ADGameDescription SciGameDescriptions[] = { 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 @@ static const struct ADGameDescription SciGameDescriptions[] = { {NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH }, +#endif // Space Quest 4 - English DOS // Executable scanning reports "1.000.753" diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index 3fac6925a4..1fb37f458d 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -852,7 +852,6 @@ byte *SegManager::allocDynmem(int size, const char *descr, reg_t *addr) { } 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 |