[Scummvm-cvs-logs] SF.net SVN: scummvm:[43478] scummvm/branches/gsoc2009-mods
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Mon Aug 17 14:58:53 CEST 2009
Revision: 43478
http://scummvm.svn.sourceforge.net/scummvm/?rev=43478&view=rev
Author: nolange
Date: 2009-08-17 12:58:53 +0000 (Mon, 17 Aug 2009)
Log Message:
-----------
merge with trunk
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/common/stream.h
scummvm/branches/gsoc2009-mods/engines/agi/op_cmd.cpp
scummvm/branches/gsoc2009-mods/engines/cruise/cruise_main.cpp
scummvm/branches/gsoc2009-mods/engines/gob/inter.h
scummvm/branches/gsoc2009-mods/engines/groovie/script.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/gui_lol.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/lol.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/saveload_lol.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/scene_lol.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/screen.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lol.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/sprites_lol.cpp
scummvm/branches/gsoc2009-mods/engines/saga/sndres.cpp
scummvm/branches/gsoc2009-mods/engines/saga/sound.cpp
scummvm/branches/gsoc2009-mods/engines/saga/sound.h
scummvm/branches/gsoc2009-mods/engines/sci/console.cpp
scummvm/branches/gsoc2009-mods/engines/sci/console.h
scummvm/branches/gsoc2009-mods/engines/sci/debug.h
scummvm/branches/gsoc2009-mods/engines/sci/detection.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/game.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/kernel.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/kernel.h
scummvm/branches/gsoc2009-mods/engines/sci/engine/kevent.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/kgraphics.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/kmovement.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/kscripts.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/ksound.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/memobj.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/memobj.h
scummvm/branches/gsoc2009-mods/engines/sci/engine/savegame.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/script.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/script.h
scummvm/branches/gsoc2009-mods/engines/sci/engine/scriptdebug.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/seg_manager.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/seg_manager.h
scummvm/branches/gsoc2009-mods/engines/sci/engine/state.h
scummvm/branches/gsoc2009-mods/engines/sci/engine/vm.cpp
scummvm/branches/gsoc2009-mods/engines/sci/engine/vm.h
scummvm/branches/gsoc2009-mods/engines/sci/exereader.cpp
scummvm/branches/gsoc2009-mods/engines/sci/exereader.h
scummvm/branches/gsoc2009-mods/engines/sci/gfx/gfx_resmgr.cpp
scummvm/branches/gsoc2009-mods/engines/sci/gfx/gfx_resmgr.h
scummvm/branches/gsoc2009-mods/engines/sci/gfx/gfx_state_internal.h
scummvm/branches/gsoc2009-mods/engines/sci/gfx/gfx_widgets.h
scummvm/branches/gsoc2009-mods/engines/sci/resource.cpp
scummvm/branches/gsoc2009-mods/engines/sci/resource.h
scummvm/branches/gsoc2009-mods/engines/sci/sci.cpp
scummvm/branches/gsoc2009-mods/engines/sci/sci.h
scummvm/branches/gsoc2009-mods/engines/sci/sfx/softseq/adlib.cpp
scummvm/branches/gsoc2009-mods/engines/sci/vocabulary.cpp
scummvm/branches/gsoc2009-mods/engines/scumm/imuse/imuse.cpp
scummvm/branches/gsoc2009-mods/engines/tinsel/pcode.cpp
scummvm/branches/gsoc2009-mods/sound/audiostream.cpp
Property Changed:
----------------
scummvm/branches/gsoc2009-mods/
scummvm/branches/gsoc2009-mods/backends/platform/iphone/osys_main.cpp
scummvm/branches/gsoc2009-mods/backends/platform/iphone/osys_main.h
scummvm/branches/gsoc2009-mods/sound/iff_sound.cpp
scummvm/branches/gsoc2009-mods/sound/iff_sound.h
Property changes on: scummvm/branches/gsoc2009-mods
___________________________________________________________________
Modified: svn:mergeinfo
- /scummvm/trunk:41377-43442
+ /scummvm/trunk:41377-43475
Property changes on: scummvm/branches/gsoc2009-mods/backends/platform/iphone/osys_main.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /scummvm/trunk/backends/platform/iphone/osys_main.cpp:42569-43442
+ /scummvm/trunk/backends/platform/iphone/osys_main.cpp:42569-43475
Property changes on: scummvm/branches/gsoc2009-mods/backends/platform/iphone/osys_main.h
___________________________________________________________________
Modified: svn:mergeinfo
- /scummvm/trunk/backends/platform/iphone/osys_main.h:42569-43442
+ /scummvm/trunk/backends/platform/iphone/osys_main.h:42569-43475
Modified: scummvm/branches/gsoc2009-mods/common/stream.h
===================================================================
--- scummvm/branches/gsoc2009-mods/common/stream.h 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/common/stream.h 2009-08-17 12:58:53 UTC (rev 43478)
@@ -400,6 +400,7 @@
/**
* SubReadStream provides access to a ReadStream restricted to the range
* [currentPosition, currentPosition+end).
+ *
* Manipulating the parent stream directly /will/ mess up a substream.
* Likewise, manipulating two substreams of a parent stream will cause them to
* step on each others toes.
@@ -434,6 +435,9 @@
* SeekableSubReadStream provides access to a SeekableReadStream restricted to
* the range [begin, end).
* The same caveats apply to SeekableSubReadStream as do to SeekableReadStream.
+ *
+ * Manipulating the parent stream directly /will/ mess up a substream.
+ * @see SubReadStream
*/
class SeekableSubReadStream : public SubReadStream, public SeekableReadStream {
protected:
@@ -451,6 +455,9 @@
/**
* This is a wrapper around SeekableSubReadStream, but it adds non-endian
* read methods whose endianness is set on the stream creation.
+ *
+ * Manipulating the parent stream directly /will/ mess up a substream.
+ * @see SubReadStream
*/
class SeekableSubReadStreamEndian : public SeekableSubReadStream {
public:
Modified: scummvm/branches/gsoc2009-mods/engines/agi/op_cmd.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/agi/op_cmd.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/agi/op_cmd.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -1818,7 +1818,6 @@
}
_game.execStack.back().curIP = ip;
- processEvents();
switch (op = *(code + ip++)) {
case 0xff: // if (open/close)
Modified: scummvm/branches/gsoc2009-mods/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/cruise/cruise_main.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/cruise/cruise_main.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -1738,7 +1738,7 @@
// Delay for the specified amount of time, but still respond to events
bool skipEvents = false;
- while (currentTick < lastTick + _gameSpeed) {
+ do {
g_system->delayMillis(10);
currentTick = g_system->getMillis();
@@ -1749,7 +1749,7 @@
if (_vm->getDebugger()->isAttached())
_vm->getDebugger()->onFrame();
- }
+ } while (currentTick < lastTick + _gameSpeed);
} else {
manageEvents();
Modified: scummvm/branches/gsoc2009-mods/engines/gob/inter.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/gob/inter.h 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/gob/inter.h 2009-08-17 12:58:53 UTC (rev 43478)
@@ -560,6 +560,7 @@
bool oPlaytoons_checkData(OpFuncParams ¶ms);
void oPlaytoons_CD_20_23();
void oPlaytoons_CD_25();
+ void oPlaytoons_openItk();
};
} // End of namespace Gob
Modified: scummvm/branches/gsoc2009-mods/engines/groovie/script.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/groovie/script.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/groovie/script.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -219,7 +219,7 @@
// Only output if we're not re-doing the previous instruction
if (_currentInstruction != _oldInstruction) {
- debugScript(1, false, _debugString.c_str());
+ debugScript(1, false, "%s", _debugString.c_str());
_oldInstruction = _currentInstruction;
}
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/gui_lol.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/gui_lol.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -127,7 +127,7 @@
if (_availableSpells[i] == -1)
continue;
uint8 col = (i == _selectedSpell) ? 132 : 1;
- _screen->fprintString(getLangString(_spellProperties[_availableSpells[i]].spellNameCode), 24, y, col, 0, 0);
+ _screen->fprintString("%s", 24, y, col, 0, 0, getLangString(_spellProperties[_availableSpells[i]].spellNameCode));
y += 9;
}
}
@@ -138,7 +138,7 @@
if (_availableSpells[i] == -1)
continue;
uint8 col = (mode && (i == _selectedSpell)) ? 132 : 1;
- _screen->fprintString(getLangString(_spellProperties[_availableSpells[i]].spellNameCode), 24, y, col, 0, 0);
+ _screen->fprintString("%s", 24, y, col, 0, 0, getLangString(_spellProperties[_availableSpells[i]].spellNameCode));
y += 9;
}
}
@@ -165,14 +165,14 @@
_screen->copyRegion(80, 143, 80, 143, 232, 35, 0, 2);
gui_drawAllCharPortraitsWithStats();
- _screen->fprintString(l->name, 157, 9, 254, 0, 5);
+ _screen->fprintString("%s", 157, 9, 254, 0, 5, l->name);
gui_printCharInventoryStats(charNum);
for (int i = 0; i < 11; i++)
gui_drawCharInventoryItem(i);
- _screen->fprintString(getLangString(0x4033), 182, 103, 172, 0, 5);
+ _screen->fprintString("%s", 182, 103, 172, 0, 5, getLangString(0x4033));
static const uint16 statusFlags[] = { 0x0080, 0x0000, 0x1000, 0x0002, 0x100, 0x0001, 0x0000, 0x0000 };
@@ -232,14 +232,14 @@
y = index * 10 + 22;
col = 158;
if (redraw)
- _screen->fprintString(getLangString(0x4014 + index), offs + 108, y, col, 0, 4);
+ _screen->fprintString("%s", offs + 108, y, col, 0, 4, getLangString(0x4014 + index));
} else {
//skills
int s = index - 2;
y = s * 10 + 62;
col = _characters[_selectedCharacter].flags & (0x200 << s) ? 254 : 180;
if (redraw)
- _screen->fprintString(getLangString(0x4014 + index), offs + 108, y, col, 0, 4);
+ _screen->fprintString("%s", offs + 108, y, col, 0, 4, getLangString(0x4014 + index));
}
if (offs)
@@ -1215,7 +1215,7 @@
return 1;
}
- _txt->printMessage(2, getLangString((flg & 8) ? 0x4029 : ((flg & 0x10) ? 0x402a : 0x402b)));
+ _txt->printMessage(2, "%s", getLangString((flg & 8) ? 0x4029 : ((flg & 0x10) ? 0x402a : 0x402b)));
return 1;
}
@@ -1235,13 +1235,13 @@
}
if (!f)
- _txt->printMessage(_itemsInPlay[_itemInHand].itemPropertyIndex == 231 ? 2 : 0, getLangString(0x418C));
+ _txt->printMessage(_itemsInPlay[_itemInHand].itemPropertyIndex == 231 ? 2 : 0, "%s", getLangString(0x418C));
return 1;
}
} else {
if (!_characters[_selectedCharacter].items[button->arg]) {
- _txt->printMessage(0, getLangString(_inventorySlotDesc[button->arg] + 8));
+ _txt->printMessage(0, "%s", getLangString(_inventorySlotDesc[button->arg] + 8));
return 1;
}
}
@@ -1506,7 +1506,7 @@
int LoLEngine::clickedSpellTargetScene(Button *button) {
LoLCharacter *c = &_characters[_activeSpell.charNum];
- _txt->printMessage(0, getLangString(0x4041));
+ _txt->printMessage(0, "%s", getLangString(0x4041));
c->magicPointsCur += _activeSpell.p->mpRequired[_activeSpell.level];
if (c->magicPointsCur > c->magicPointsMax)
@@ -1633,7 +1633,7 @@
_screen->fillRect(112, 0, 288, 120, 1);
gui_drawAllCharPortraitsWithStats();
- _txt->printMessage(0x8000, getLangString(0x4057));
+ _txt->printMessage(0x8000, "%s", getLangString(0x4057));
gui_toggleButtonDisplayMode(77, 0);
int h = 600 / tHp;
@@ -1761,7 +1761,7 @@
_partyAwake = true;
updateDrawPage2();
gui_drawScene(0);
- _txt->printMessage(0x8000, getLangString(0x4059));
+ _txt->printMessage(0x8000, "%s", getLangString(0x4059));
_screen->fadeToPalette1(40);
} else {
@@ -1774,12 +1774,12 @@
if (needPoisoningFlags & (1 << i))
setTemporaryFaceFrame(i, 3, 8, 0);
}
- _txt->printMessage(0x8000, getLangString(0x405a));
+ _txt->printMessage(0x8000, "%s", getLangString(0x405a));
gui_drawAllCharPortraitsWithStats();
} else {
setTemporaryFaceFrameForAllCharacters(2, 4, 1);
- _txt->printMessage(0x8000, getLangString(0x4058));
+ _txt->printMessage(0x8000, "%s", getLangString(0x4058));
}
gui_toggleButtonDisplayMode(77, 0);
}
@@ -1798,9 +1798,9 @@
if (_compassBroken) {
if (characterSays(0x425b, -1, true))
- _txt->printMessage(4, getLangString(0x425b));
+ _txt->printMessage(4, "%s", getLangString(0x425b));
} else {
- _txt->printMessage(0, getLangString(0x402f + _currentDirection));
+ _txt->printMessage(0, "%s", getLangString(0x402f + _currentDirection));
}
return 1;
@@ -1824,11 +1824,11 @@
if (_itemsInPlay[_itemInHand].itemPropertyIndex == 248) {
if (_lampOilStatus >= 100) {
- _txt->printMessage(0, getLangString(0x4061));
+ _txt->printMessage(0, "%s", getLangString(0x4061));
return 1;
}
- _txt->printMessage(0, getLangString(0x4062));
+ _txt->printMessage(0, "%s", getLangString(0x4062));
deleteItem(_itemInHand);
snd_playSoundEffect(181, -1);
@@ -1860,7 +1860,7 @@
if (str == 0 || str > 3)
return 1;
- _txt->printMessage(0x8002, getLangString(str == 1 ? 0x424c : (str == 2 ? 0x424e : 0x424d)));
+ _txt->printMessage(0x8002, "%s", getLangString(str == 1 ? 0x424c : (str == 2 ? 0x424e : 0x424d)));
return 1;
}
@@ -2386,7 +2386,7 @@
fC = _screen->getTextWidth(_saveDescription);
}
- _screen->fprintString(_saveDescription, (d->sx << 3), d->sy + 2, d->unk8, d->unkA, 0);
+ _screen->fprintString("%s", (d->sx << 3), d->sy + 2, d->unk8, d->unkA, 0, _saveDescription);
_screen->fillRect((d->sx << 3) + fC, d->sy, (d->sx << 3) + fC + wW, d->sy + d->h - 1, d->unk8, 0);
_screen->setCurPage(pg);
}
@@ -2485,7 +2485,7 @@
}
void GUI_LoL::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags, Screen::FontId font) {
- _screen->fprintString(str, x, y, c0, c1, flags);
+ _screen->fprintString("%s", x, y, c0, c1, flags, str);
}
int GUI_LoL::getMenuCenterStringX(const char *str, int x1, int x2) {
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/lol.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/lol.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/lol.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -1900,7 +1900,7 @@
_activeSpell.level = ABS(spellLevel);
if ((_spellProperties[spellType].flags & 0x100) && testWallFlag(calcNewBlockPosition(_currentBlock, _currentDirection), _currentDirection, 1)) {
- _txt->printMessage(2, getLangString(0x4257));
+ _txt->printMessage(2, "%s", getLangString(0x4257));
return 0;
}
@@ -2062,7 +2062,7 @@
}
int LoLEngine::processMagicHealSelectTarget() {
- _txt->printMessage(0, getLangString(0x4040));
+ _txt->printMessage(0, "%s", getLangString(0x4040));
gui_resetButtonList();
gui_setFaceFramesControlButtons(81, 0);
gui_initButtonsFromList(_buttonList8);
@@ -2929,7 +2929,7 @@
}
if (_availableSpells[i] == spell) {
- _txt->printMessage(2, getLangString(0x42d0));
+ _txt->printMessage(2, "%s", getLangString(0x42d0));
return;
}
}
@@ -2965,7 +2965,7 @@
if (_availableSpells[ii] == -1)
continue;
uint8 col = (ii == _selectedSpell) ? 132 : 1;
- _screen->fprintString(getLangString(_spellProperties[_availableSpells[ii]].spellNameCode), 24, y, col, 0, 0);
+ _screen->fprintString("%s", 24, y, col, 0, 0, getLangString(_spellProperties[_availableSpells[ii]].spellNameCode));
y += 9;
}
@@ -3459,7 +3459,7 @@
if (t) {
giveItemToMonster(monster, t);
if (characterSays(0x4019, _characters[target].id, true))
- _txt->printMessage(6, getLangString(0x4019));
+ _txt->printMessage(6, "%s", getLangString(0x4019));
}
break;
@@ -3473,7 +3473,7 @@
if (t) {
deleteItem(t);
if (characterSays(0x401b, _characters[target].id, true))
- _txt->printMessage(6, getLangString(0x401b));
+ _txt->printMessage(6, "%s", getLangString(0x401b));
}
break;
@@ -3541,12 +3541,12 @@
if (monster->properties->defenseSkillType == 1) {
giveItemToMonster(monster, itm);
if (characterSays(0x401c, _characters[attacker].id, true))
- _txt->printMessage(6, getLangString(0x401c));
+ _txt->printMessage(6, "%s", getLangString(0x401c));
} else {
deleteItem(itm);
if (characterSays(0x401d, _characters[attacker].id, true))
- _txt->printMessage(6, getLangString(0x401d));
+ _txt->printMessage(6, "%s", getLangString(0x401d));
}
}
break;
@@ -4315,7 +4315,7 @@
void LoLEngine::printMapExitButtonText() {
int cp = _screen->setCurPage(2);
- _screen->fprintString(getLangString(0x4033), 295, 182, 172, 0, 5);
+ _screen->fprintString("%s", 295, 182, 172, 0, 5, getLangString(0x4033));
_screen->setCurPage(cp);
}
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/saveload_lol.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/saveload_lol.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -43,7 +43,7 @@
SaveHeader header;
Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
if (!saveFile) {
- _txt->printMessage(2, getLangString(0x425d));
+ _txt->printMessage(2, "%s", getLangString(0x425d));
return Common::kNoError;
}
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/scene_lol.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/scene_lol.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -762,7 +762,7 @@
movePartySmoothScrollBlocked(2);
snd_stopSpeech(true);
- _txt->printMessage(0x8002, getLangString(0x403f));
+ _txt->printMessage(0x8002, "%s", getLangString(0x403f));
snd_playSoundEffect(19, -1);
}
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/screen.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/screen.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/screen.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -1253,8 +1253,7 @@
}
if (flags & 0x200) {
- ++_drawShapeVar1;
- _drawShapeVar1 &= (_vm->gameFlags().gameID == GI_KYRA1) ? 0x7 : 0xF;
+ _drawShapeVar1 = (_drawShapeVar1 + 1) & 0x7;
_drawShapeVar3 = drawShapeVar2[_drawShapeVar1];
_drawShapeVar4 = 0;
_drawShapeVar5 = 256;
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lok.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -1142,6 +1142,11 @@
_seqPlayerFlag = false;
_screen->showMouse();
+
+ // To avoid any remaining input events, we remove the queue
+ // over here.
+ _eventList.clear();
+
if (_flags.platform == Common::kPlatformAmiga) {
_screen->_charWidth = -2;
_screen->setCurPage(2);
@@ -1362,15 +1367,12 @@
}
int size = 0;
- const uint8 *bufferTmp = _staticres->loadRawData(k1CreditsStrings, size);
- char *buffer = new char[size];
- assert(buffer);
- memcpy(buffer, bufferTmp, size);
+ const char *creditsData = (const char *)_staticres->loadRawData(k1CreditsStrings, size);
char stringBuffer[81];
memset(stringBuffer, 0, sizeof(stringBuffer));
- char *cur = buffer;
+ const char *cur = creditsData;
char *specialString = stringBuffer;
bool fillRectFlag = false, subWidth = false, centerFlag = false;
x = 0;
@@ -1432,9 +1434,7 @@
removeInputTop();
break;
}
- } while (++cur != buffer + size && !shouldQuit());
-
- delete[] buffer;
+ } while (++cur != (creditsData + size) && !shouldQuit());
}
bool KyraEngine_LoK::seq_skipSequence() const {
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lol.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sequences_lol.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -290,7 +290,7 @@
_screen->_curPage = 2;
for (int i = 0; i < 4; ++i)
- _screen->fprintStringIntro(_charPreviews[i].name, _charPreviews[i].x + 16, _charPreviews[i].y + 36, 0xC0, 0x00, 0x9C, 0x120);
+ _screen->fprintStringIntro("%s", _charPreviews[i].x + 16, _charPreviews[i].y + 36, 0xC0, 0x00, 0x9C, 0x120, _charPreviews[i].name);
for (int i = 0; i < 4; ++i) {
_screen->fprintStringIntro("%d", _charPreviews[i].x + 21, _charPreviews[i].y + 48, 0x98, 0x00, 0x9C, 0x220, _charPreviews[i].attrib[0]);
@@ -298,9 +298,9 @@
_screen->fprintStringIntro("%d", _charPreviews[i].x + 21, _charPreviews[i].y + 64, 0x98, 0x00, 0x9C, 0x220, _charPreviews[i].attrib[2]);
}
- _screen->fprintStringIntro(_tim->getCTableEntry(51), 36, 173, 0x98, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(53), 36, 181, 0x98, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(55), 36, 189, 0x98, 0x00, 0x9C, 0x20);
+ _screen->fprintStringIntro("%s", 36, 173, 0x98, 0x00, 0x9C, 0x20, _tim->getCTableEntry(51));
+ _screen->fprintStringIntro("%s", 36, 181, 0x98, 0x00, 0x9C, 0x20, _tim->getCTableEntry(53));
+ _screen->fprintStringIntro("%s", 36, 189, 0x98, 0x00, 0x9C, 0x20, _tim->getCTableEntry(55));
_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
_screen->_curPage = 0;
@@ -363,11 +363,11 @@
_screen->copyRegion(0, 0, 0, 0, 112, 120, 4, 0, Screen::CR_NO_P_CHECK);
int y = 38;
- _screen->fprintStringIntro(_tim->getCTableEntry(57), 8, y, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(58), 8, y + 10, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(59), 8, y + 20, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(60), 8, y + 30, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(61), 8, y + 40, 0x32, 0x00, 0x9C, 0x20);
+ _screen->fprintStringIntro("%s", 8, y, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(57));
+ _screen->fprintStringIntro("%s", 8, y + 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(58));
+ _screen->fprintStringIntro("%s", 8, y + 20, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(59));
+ _screen->fprintStringIntro("%s", 8, y + 30, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(60));
+ _screen->fprintStringIntro("%s", 8, y + 40, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(61));
_sound->voicePlay("KING01", &_speechHandle);
@@ -405,8 +405,8 @@
_screen->copyRegion(0, 0, 0, 0, 112, 120, 4, 0, Screen::CR_NO_P_CHECK);
int y = 48;
- _screen->fprintStringIntro(_tim->getCTableEntry(62), 8, y, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(63), 8, y + 10, 0x32, 0x00, 0x9C, 0x20);
+ _screen->fprintStringIntro("%s", 8, y, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(62));
+ _screen->fprintStringIntro("%s", 8, y + 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(63));
_sound->voicePlay("KING02", &_speechHandle);
@@ -540,13 +540,13 @@
static const uint8 charSelectInfoIdx[] = { 0x1D, 0x22, 0x27, 0x2C };
const int idx = charSelectInfoIdx[character];
- _screen->fprintStringIntro(_tim->getCTableEntry(idx+0), 50, 127, 0x53, 0x00, 0xCF, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(idx+1), 50, 137, 0x53, 0x00, 0xCF, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(idx+2), 50, 147, 0x53, 0x00, 0xCF, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(idx+3), 50, 157, 0x53, 0x00, 0xCF, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(idx+4), 50, 167, 0x53, 0x00, 0xCF, 0x20);
+ _screen->fprintStringIntro("%s", 50, 127, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx+0));
+ _screen->fprintStringIntro("%s", 50, 137, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx+1));
+ _screen->fprintStringIntro("%s", 50, 147, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx+2));
+ _screen->fprintStringIntro("%s", 50, 157, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx+3));
+ _screen->fprintStringIntro("%s", 50, 167, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx+4));
- _screen->fprintStringIntro(_tim->getCTableEntry(69), 100, 168, 0x32, 0x00, 0xCF, 0x20);
+ _screen->fprintStringIntro("%s", 100, 168, 0x32, 0x00, 0xCF, 0x20, _tim->getCTableEntry(69));
selectionCharInfoIntro(vocFilename);
if (_charSelectionInfoResult == -1) {
@@ -568,11 +568,11 @@
_screen->copyRegion(48, 127, 48, 160, 272, 35, 4, 0, Screen::CR_NO_P_CHECK);
_screen->copyRegion(0, 0, 0, 0, 112, 120, 4, 0, Screen::CR_NO_P_CHECK);
- _screen->fprintStringIntro(_tim->getCTableEntry(64), 3, 28, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(65), 3, 38, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(66), 3, 48, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(67), 3, 58, 0x32, 0x00, 0x9C, 0x20);
- _screen->fprintStringIntro(_tim->getCTableEntry(68), 3, 68, 0x32, 0x00, 0x9C, 0x20);
+ _screen->fprintStringIntro("%s", 3, 28, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(64));
+ _screen->fprintStringIntro("%s", 3, 38, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(65));
+ _screen->fprintStringIntro("%s", 3, 48, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(66));
+ _screen->fprintStringIntro("%s", 3, 58, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(67));
+ _screen->fprintStringIntro("%s", 3, 68, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(68));
resetSkipFlag();
kingSelectionOutro();
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sprites_lol.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sprites_lol.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -1307,7 +1307,7 @@
if (getMonsterDistance(monster->block, _monsters[i].block) < 7)
setMonsterMode(monster, 7);
}
- _txt->printMessage(2, getLangString(0x401a));
+ _txt->printMessage(2, "%s", getLangString(0x401a));
} else if (flyingObject == 4) {
launchMagicViper();
Modified: scummvm/branches/gsoc2009-mods/engines/saga/sndres.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/saga/sndres.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/saga/sndres.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -192,7 +192,6 @@
GameSoundTypes resourceType = kSoundPCM;
byte *data = 0;
int rate = 0, size = 0;
- byte flags = 0;
Common::File* file;
if (resourceId == (uint32)-1) {
@@ -269,21 +268,17 @@
}
- // Default sound type is 16-bit PCM (used in ITE)
- buffer.isBigEndian = context->isBigEndian;
- if ((context->fileType & GAME_VOICEFILE) && (_vm->getFeatures() & GF_LE_VOICES))
- buffer.isBigEndian = false;
+ // Default sound type is 16-bit signed PCM, used in ITE by PCM and VOX files
buffer.isCompressed = context->isCompressed;
buffer.soundType = resourceType;
buffer.originalSize = 0;
- buffer.stereo = false;
- buffer.isSigned = true; // default for PCM and VOX
- buffer.frequency = 22050; // default for PCM and VOX
- buffer.sampleBits = 16; // default for PCM and VOX
+ // Set default flags and frequency for PCM, VOC and VOX files, which got no header
+ buffer.flags = Audio::Mixer::FLAG_16BITS;
+ buffer.frequency = 22050;
if (_vm->getGameId() == GID_ITE) {
if (_vm->getFeatures() & GF_8BIT_UNSIGNED_PCM) { // older ITE demos
- buffer.isSigned = false;
- buffer.sampleBits = 8;
+ buffer.flags |= Audio::Mixer::FLAG_UNSIGNED;
+ buffer.flags &= ~Audio::Mixer::FLAG_16BITS;
} else {
// Voice files in newer ITE demo versions are OKI ADPCM (VOX) encoded
if (!scumm_stricmp(context->fileName, "voicesd.rsc"))
@@ -292,6 +287,12 @@
}
buffer.buffer = NULL;
+ // Check for LE sounds
+ if (!context->isBigEndian)
+ buffer.flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+ if ((context->fileType & GAME_VOICEFILE) && (_vm->getFeatures() & GF_LE_VOICES))
+ buffer.flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
+
// Older Mac versions of ITE were Macbinary packed
int soundOffset = (context->fileType & GAME_MACBINARY) ? 36 : 0;
@@ -321,25 +322,23 @@
case kSoundShorten:
case kSoundVOC:
if (resourceType == kSoundWAV) {
- result = Audio::loadWAVFromStream(readS, size, rate, flags);
+ result = Audio::loadWAVFromStream(readS, size, rate, buffer.flags);
} else if (resourceType == kSoundAIFF) {
- result = Audio::loadAIFFFromStream(readS, size, rate, flags);
+ result = Audio::loadAIFFFromStream(readS, size, rate, buffer.flags);
+#ifdef ENABLE_SAGA2
+ } else if (resourceType == kSoundShorten) {
+ result = Audio::loadShortenFromStream(readS, size, rate, buffer.flags);
+#endif
} else if (resourceType == kSoundVOC) {
data = Audio::loadVOCFromStream(readS, size, rate);
result = (data != 0);
if (onlyHeader)
free(data);
-#ifdef ENABLE_SAGA2
- } else if (resourceType == kSoundShorten) {
- result = Audio::loadShortenFromStream(readS, size, rate, flags);
-#endif
+ buffer.flags |= Audio::Mixer::FLAG_UNSIGNED;
}
if (result) {
buffer.frequency = rate;
- buffer.sampleBits = (flags & Audio::Mixer::FLAG_16BITS) ? 16 : 8;
- buffer.stereo = flags & Audio::Mixer::FLAG_STEREO;
- buffer.isSigned = (resourceType == kSoundVOC) ? false : !(flags & Audio::Mixer::FLAG_UNSIGNED);
buffer.size = size;
if (!onlyHeader && resourceType != kSoundVOC) {
@@ -360,14 +359,20 @@
readS.readByte(); // Skip compression identifier byte
buffer.frequency = readS.readUint16LE();
buffer.originalSize = readS.readUint32LE();
- buffer.sampleBits = readS.readByte();
- buffer.stereo = (readS.readByte() == char(0)) ? false : true;
+ if (readS.readByte() == 8) // read sample bits
+ buffer.flags &= ~Audio::Mixer::FLAG_16BITS;
+ if (readS.readByte() != 0) // read stereo flag
+ buffer.flags |= Audio::Mixer::FLAG_STEREO;
buffer.size = soundResourceLength;
buffer.soundType = resourceType;
- buffer.soundFile = context->getFile(resourceData);
buffer.fileOffset = resourceData->offset + 9; // skip compressed sfx header: byte + uint16 + uint32 + byte + byte
+ if (!onlyHeader) {
+ buffer.buffer = (byte *)malloc(buffer.size);
+ readS.read(buffer.buffer, buffer.size);
+ }
+
result = true;
break;
default:
@@ -403,12 +408,12 @@
msDouble = (double)buffer.size;
else
msDouble = (double)buffer.originalSize;
- if (buffer.sampleBits == 16) {
+
+ if (buffer.flags & Audio::Mixer::FLAG_16BITS)
msDouble /= 2.0;
- }
- if (buffer.stereo) {
+
+ if (buffer.flags & Audio::Mixer::FLAG_STEREO)
msDouble /= 2.0;
- }
msDouble = msDouble / buffer.frequency * 1000.0;
return (int)msDouble;
Modified: scummvm/branches/gsoc2009-mods/engines/saga/sound.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/saga/sound.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/saga/sound.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -65,84 +65,45 @@
void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int volume,
sndHandleType handleType, bool loop) {
- byte flags;
- flags = Audio::Mixer::FLAG_AUTOFREE;
+ buffer.flags |= Audio::Mixer::FLAG_AUTOFREE;
if (loop)
- flags |= Audio::Mixer::FLAG_LOOP;
+ buffer.flags |= Audio::Mixer::FLAG_LOOP;
- if (buffer.sampleBits == 16) {
- flags |= Audio::Mixer::FLAG_16BITS;
+ Audio::Mixer::SoundType soundType = (handleType == kVoiceHandle) ?
+ Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
- if (!buffer.isBigEndian)
- flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
- }
- if (buffer.stereo)
- flags |= Audio::Mixer::FLAG_STEREO;
- if (!buffer.isSigned)
- flags |= Audio::Mixer::FLAG_UNSIGNED;
-
if (!buffer.isCompressed) {
- if (handleType == kVoiceHandle)
- _mixer->playRaw(Audio::Mixer::kSpeechSoundType, handle, buffer.buffer,
- buffer.size, buffer.frequency, flags, -1, volume);
- else
- _mixer->playRaw(Audio::Mixer::kSFXSoundType, handle, buffer.buffer,
- buffer.size, buffer.frequency, flags, -1, volume);
+ _mixer->playRaw(soundType, handle, buffer.buffer,
+ buffer.size, buffer.frequency, buffer.flags, -1, volume);
} else {
- Audio::AudioStream *stream = NULL;
-#if defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_FLAC)
- MemoryReadStream *tmp = NULL;
-#endif
+ Audio::AudioStream *stream = 0;
switch (buffer.soundType) {
#ifdef USE_MAD
case kSoundMP3:
- debug(1, "Playing MP3 compressed sound");
- buffer.soundFile->seek((long)buffer.fileOffset, SEEK_SET);
- tmp = buffer.soundFile->readStream(buffer.size);
- assert(tmp);
- stream = Audio::makeMP3Stream(tmp, true);
+ stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, true), true);
break;
#endif
#ifdef USE_VORBIS
case kSoundOGG:
- debug(1, "Playing OGG compressed sound");
- buffer.soundFile->seek((long)buffer.fileOffset, SEEK_SET);
- tmp = buffer.soundFile->readStream(buffer.size);
- assert(tmp);
- stream = Audio::makeVorbisStream(tmp, true);
+ stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, true), true);
break;
#endif
#ifdef USE_FLAC
case kSoundFLAC:
- debug(1, "Playing FLAC compressed sound");
- buffer.soundFile->seek((long)buffer.fileOffset, SEEK_SET);
- tmp = buffer.soundFile->readStream(buffer.size);
- assert(tmp);
- stream = Audio::makeFlacStream(tmp, true);
+ stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, true), true);
break;
#endif
default:
- // No compression, play it as raw sound
- if (handleType == kVoiceHandle)
- _mixer->playRaw(Audio::Mixer::kSpeechSoundType, handle, buffer.buffer,
- buffer.size, buffer.frequency, flags, -1, volume);
- else
- _mixer->playRaw(Audio::Mixer::kSFXSoundType, handle, buffer.buffer,
- buffer.size, buffer.frequency, flags, -1, volume);
+ // Unknown compression, ignore sample
+ warning("Unknown compression, ignoring sound");
break;
}
- if (stream != NULL) {
- if (handleType == kVoiceHandle)
- _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, handle, stream, -1,
- volume, 0, true, false);
- else
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, stream, -1,
- volume, 0, true, false);
- }
+ if (stream != NULL)
+ _mixer->playInputStream(soundType, handle, stream, -1, volume, 0, true, false);
}
}
Modified: scummvm/branches/gsoc2009-mods/engines/saga/sound.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/saga/sound.h 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/saga/sound.h 2009-08-17 12:58:53 UTC (rev 43478)
@@ -44,17 +44,13 @@
struct SoundBuffer {
uint16 frequency;
- int sampleBits;
- bool stereo;
- bool isSigned;
bool isCompressed;
+ byte flags;
byte *buffer;
size_t size;
size_t originalSize;
- bool isBigEndian;
GameSoundTypes soundType;
- Common::File *soundFile;
size_t fileOffset;
};
Modified: scummvm/branches/gsoc2009-mods/engines/sci/console.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/sci/console.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/sci/console.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -889,10 +889,11 @@
bool Console::cmdClassTable(int argc, const char **argv) {
DebugPrintf("Available classes:\n");
- for (uint i = 0; i < _vm->_gamestate->_classtable.size(); i++) {
- if (_vm->_gamestate->_classtable[i].reg.segment) {
+ for (uint i = 0; i < _vm->_gamestate->seg_manager->_classtable.size(); i++) {
+ if (_vm->_gamestate->seg_manager->_classtable[i].reg.segment) {
DebugPrintf(" Class 0x%x at %04x:%04x (script 0x%x)\n", i,
- PRINT_REG(_vm->_gamestate->_classtable[i].reg), _vm->_gamestate->_classtable[i].script);
+ PRINT_REG(_vm->_gamestate->seg_manager->_classtable[i].reg),
+ _vm->_gamestate->seg_manager->_classtable[i].script);
}
}
@@ -1394,10 +1395,11 @@
for (uint i = 0; i < scr->_objects.size(); i++) {
DebugPrintf(" ");
// Object header
- Object *obj = obj_get(_vm->_gamestate, scr->_objects[i].pos);
+ Object *obj = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, scr->_objects[i].pos);
if (obj)
DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(scr->_objects[i].pos),
- obj_get_name(_vm->_gamestate, scr->_objects[i].pos), obj->_variables.size(), obj->methods_nr);
+ obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version,
+ scr->_objects[i].pos), obj->_variables.size(), obj->methods_nr);
}
}
break;
@@ -1438,12 +1440,13 @@
reg_t objpos;
objpos.offset = i;
objpos.segment = nr;
- DebugPrintf(" [%04x] %s; copy of ", i, obj_get_name(_vm->_gamestate, objpos));
+ DebugPrintf(" [%04x] %s; copy of ", i, obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, objpos));
// Object header
- Object *obj = obj_get(_vm->_gamestate, ct->_table[i].pos);
+ Object *obj = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, ct->_table[i].pos);
if (obj)
DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(ct->_table[i].pos),
- obj_get_name(_vm->_gamestate, ct->_table[i].pos), obj->_variables.size(), obj->methods_nr);
+ obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, ct->_table[i].pos),
+ obj->_variables.size(), obj->methods_nr);
}
}
break;
@@ -2045,7 +2048,7 @@
for (iter = _vm->_gamestate->_executionStack.begin();
iter != _vm->_gamestate->_executionStack.end(); ++iter, ++i) {
ExecStack &call = *iter;
- const char *objname = obj_get_name(_vm->_gamestate, call.sendp);
+ const char *objname = obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, call.sendp);
int paramc, totalparamc;
switch (call.type) {
@@ -2187,7 +2190,7 @@
return true;
}
- Object *obj = obj_get(_vm->_gamestate, objAddr);
+ Object *obj = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, objAddr);
int selector_id = _vm->getKernel()->findSelector(argv[2]);
reg_t addr;
@@ -2295,7 +2298,7 @@
return true;
}
- o = obj_get(_vm->_gamestate, object);
+ o = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, object);
if (o == NULL) {
DebugPrintf("Address \"%04x:%04x\" is not an object\n", PRINT_REG(object));
return true;
@@ -2900,7 +2903,7 @@
}
if (valid) {
- const char *objname = obj_get_name(s, objpos);
+ const char *objname = obj_get_name(s->seg_manager, s->_version, objpos);
if (!strcmp(objname, str_objname)) {
// Found a match!
if ((index < 0) && (times_found > 0)) {
@@ -3042,9 +3045,10 @@
int Console::printObject(reg_t pos) {
EngineState *s = _vm->_gamestate; // for the several defines in this function
- Object *obj = obj_get(s, pos);
+ Object *obj = obj_get(s->seg_manager, s->_version, pos);
Object *var_container = obj;
int i;
+ SciVersion version = s->_version; // for the selector defines
if (!obj) {
DebugPrintf("[%04x:%04x]: Not an object.", PRINT_REG(pos));
@@ -3052,11 +3056,11 @@
}
// Object header
- DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(pos), obj_get_name(s, pos),
+ DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(pos), obj_get_name(s->seg_manager, s->_version, pos),
obj->_variables.size(), obj->methods_nr);
if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS))
- var_container = obj_get(s, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
+ var_container = obj_get(s->seg_manager, s->_version, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
DebugPrintf(" -- member variables:\n");
for (i = 0; (uint)i < obj->_variables.size(); i++) {
printf(" ");
@@ -3068,9 +3072,9 @@
reg_t val = obj->_variables[i];
DebugPrintf("%04x:%04x", PRINT_REG(val));
- Object *ref = obj_get(s, val);
+ Object *ref = obj_get(s->seg_manager, s->_version, val);
if (ref)
- DebugPrintf(" (%s)", obj_get_name(s, val));
+ DebugPrintf(" (%s)", obj_get_name(s->seg_manager, s->_version, val));
DebugPrintf("\n");
}
Modified: scummvm/branches/gsoc2009-mods/engines/sci/console.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/sci/console.h 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/sci/console.h 2009-08-17 12:58:53 UTC (rev 43478)
@@ -29,6 +29,7 @@
#define SCI_CONSOLE_H
#include "gui/debugger.h"
+#include "sci/engine/vm.h"
namespace Sci {
Modified: scummvm/branches/gsoc2009-mods/engines/sci/debug.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/sci/debug.h 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/sci/debug.h 2009-08-17 12:58:53 UTC (rev 43478)
@@ -26,6 +26,9 @@
#ifndef SCI_DEBUG_H
#define SCI_DEBUG_H
+#include "sci/engine/vm_types.h" // for StackPtr
+#include "sci/engine/vm.h" // for ExecStack
+
namespace Sci {
enum DebugSeeking {
Modified: scummvm/branches/gsoc2009-mods/engines/sci/detection.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/sci/detection.cpp 2009-08-17 12:57:37 UTC (rev 43477)
+++ scummvm/branches/gsoc2009-mods/engines/sci/detection.cpp 2009-08-17 12:58:53 UTC (rev 43478)
@@ -28,6 +28,7 @@
#include "sci/sci.h"
#include "sci/exereader.h"
+#include "sci/engine/seg_manager.h"
namespace Sci {
@@ -102,18 +103,15 @@
{0, 0}
};
-#define FANMADE_LV(name, resMapMd5, resMapSize, resMd5, resSize, lang, ver) \
+#define FANMADE_L(name, resMapMd5, resMapSize, resMd5, resSize, lang) \
{{"sci-fanmade", name, { \
{"resource.map", 0, resMapMd5, resMapSize}, \
{"resource.001", 0, resMd5, resSize}, \
{NULL, 0, NULL, 0}}, lang, Common::kPlatformPC, 0, GUIO_NOSPEECH}, \
- 0, \
- ver \
+ 0 \
}
-#define FANMADE_L(name, resMapMd5, resMapSize, resMd5, resSize, lang) FANMADE_LV(name, resMapMd5, resMapSize, resMd5, resSize, lang, SCI_VERSION_0)
-#define FANMADE_V(name, resMapMd5, resMapSize, resMd5, resSize, ver) FANMADE_LV(name, resMapMd5, resMapSize, resMd5, resSize, Common::EN_ANY, ver)
-#define FANMADE(name, resMapMd5, resMapSize, resMd5, resSize) FANMADE_LV(name, resMapMd5, resMapSize, resMd5, resSize, Common::EN_ANY, SCI_VERSION_0)
+#define FANMADE(name, resMapMd5, resMapSize, resMd5, resSize) FANMADE_L(name, resMapMd5, resMapSize, resMd5, resSize, Common::EN_ANY)
using Common::GUIO_NONE;
using Common::GUIO_NOSPEECH;
@@ -126,8 +124,7 @@
{"resource.map", 0, "f3d1be7752d30ba60614533d531e2e98", 474},
{"resource.001", 0, "6fd05926c2199af0af6f72f90d0d7260", 126895},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Castle of Dr. Brain - English Amiga (from www.back2roots.org)
@@ -140,8 +137,7 @@
{"resource.002", 0, "d226d7d3b4f77c4a566913fc310487fc", 792380},
{"resource.003", 0, "d226d7d3b4f77c4a566913fc310487fc", 464348},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Castle of Dr. Brain - German Amiga (from www.back2roots.org)
@@ -154,8 +150,7 @@
{"resource.002", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 826309},
{"resource.003", 0, "85e51acb5f9c539d66e3c8fe40e17da5", 493638},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Castle of Dr. Brain - English DOS Non-Interactive Demo
@@ -165,8 +160,7 @@
{"resource.000", 0, "9780f040d58182994e22d2e34fab85b0", 67367},
{"resource.001", 0, "2af49dbd8f2e1db4ab09f9310dc91259", 570553},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Castle of Dr. Brain - English DOS Floppy (from jvprat)
@@ -178,8 +172,7 @@
{"resource.001", 0, "d2f5a1be74ed963fa849a76892be5290", 794832},
{"resource.002", 0, "c0c29c51af66d65cb53f49e785a2d978", 1280907},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Castle of Dr. Brain - English DOS Floppy 1.1
@@ -189,8 +182,7 @@
{"resource.001", 0, "13e81e1839cd7b216d2bb5615c1ca160", 796776},
{"resource.002", 0, "930e416bec196b9703a331d81b3d66f2", 1283812},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Castle of Dr. Brain - Spanish DOS
@@ -200,8 +192,7 @@
{"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 1197694},
{"resource.001", 0, "735be4e58957180cfc807d5e18fdffcd", 1433302},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Christmas Card 1988 - English DOS
@@ -210,8 +201,7 @@
{"resource.map", 0, "39485580d34a72997f3d5b3aba4d24f1", 426},
{"resource.001", 0, "11391434f41c834090d7a1e9488ce936", 129739},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Christmas Card 1990: The Seasoned Professional - English DOS (16 Colors)
@@ -220,8 +210,7 @@
{"resource.map", 0, "8f656714a05b94423ac6eb10ee8797d0", 600},
{"resource.001", 0, "acde93e58fca4f7a2a5a220558a94aa8", 272629},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Christmas Card 1990: The Seasoned Professional - English DOS (256 Colors)
@@ -230,8 +219,7 @@
{"resource.map", 0, "44b8f45b841b9b5e17e939a35e443988", 600},
{"resource.001", 0, "acde93e58fca4f7a2a5a220558a94aa8", 335362},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Christmas Card 1992 - English DOS
@@ -240,8 +228,7 @@
{"resource.map", 0, "f1f8c8a8443f523422af70b4ec85b71c", 318},
{"resource.000", 0, "62fb9256f8e7e6e65a6875efdb7939ac", 203396},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Codename: Iceman - English Amiga (from www.back2roots.org)
@@ -256,8 +243,7 @@
{"resource.004", 0, "8613c45fc771d658e5a505b9a4a54f31", 713382},
{"resource.005", 0, "605b67a9ef199a9bb015745e7c004cf4", 478384},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Codename: Iceman - English DOS Non-Interactive Demo
@@ -266,8 +252,7 @@
{"resource.map", 0, "782974f29d8a824782d2d4aea39964e3", 1056},
{"resource.001", 0, "d4b75e280d1c3a97cfef1b0bebff387c", 573647},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Codename: Iceman - English DOS (from jvprat)
@@ -281,8 +266,7 @@
{"resource.003", 0, "d97a96f1ab91b41cf46a02cc89b0a04e", 624303},
{"resource.004", 0, "8613c45fc771d658e5a505b9a4a54f31", 670883},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Codename: Iceman - English DOS (from FRG)
@@ -295,8 +279,7 @@
{"resource.003", 0, "dc7c5280e7acfaffe6ef2a6c963c5f94", 622118},
{"resource.004", 0, "64f342463f6f35ba71b3509ef696ae3f", 669188},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Conquests of Camelot - English Amiga (from www.back2roots.org)
@@ -312,8 +295,7 @@
{"resource.005", 0, "c6e551bdc24f0acc193159038d4ca767", 605882},
{"resource.006", 0, "8f880a536908ab496bbc552f7f5c3738", 585255},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Conquests of Camelot - English DOS Non-Interactive Demo
@@ -322,8 +304,7 @@
{"resource.map", 0, "f4cd75c15be75e04cdca3acda2c0b0ea", 468},
{"resource.001", 0, "4930708722f34bfbaa4945fb08f55f61", 232523},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Conquests of Camelot - English DOS (from jvprat)
@@ -336,8 +317,7 @@
{"resource.003", 0, "8e1a3a8c588007404b532b8dfacc1460", 723712},
{"resource.004", 0, "8e1a3a8c588007404b532b8dfacc1460", 729143},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Conquests of Camelot - English DOS
@@ -352,8 +332,7 @@
{"resource.006", 0, "8e1a3a8c588007404b532b8dfacc1460", 332446},
{"resource.007", 0, "8e1a3a8c588007404b532b8dfacc1460", 358182},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Conquests of the Longbow - English Amiga (from www.back2roots.org)
@@ -369,8 +348,7 @@
{"resource.005", 0, "1c3804e56b114028c5873a35c2f06d13", 653002},
{"resource.006", 0, "f9487732289a4f4966b4e34eea413325", 842817},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Conquests of the Longbow - English DOS
@@ -385,8 +363,7 @@
{"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1154950},
{"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1042966},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Conquests of the Longbow - English DOS Floppy (from jvprat)
@@ -401,8 +378,7 @@
{"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1261462},
{"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284720},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Conquests of the Longbow - English DOS
@@ -416,8 +392,7 @@
{"resource.004", 0, "9cfce07e204a329e94fda8b5657621da", 1260237},
{"resource.005", 0, "21ebe6b39b57a73fc449f67f013765aa", 1284609},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Conquests of the Longbow EGA - English DOS
@@ -433,7 +408,6 @@
{"resource.006", 0, "8c767b3939add63d11274065e46aad04", 713158},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
0,
- SCI_VERSION_1
},
// Conquests of the Longbow - English DOS Non-Interactive Demo
@@ -442,8 +416,7 @@
{"resource.map", 0, "cbc5cb73341de1bff1b1e20a640af220", 588},
{"resource.001", 0, "f05a20cc07eee85da8e999d0ac0f596b", 869916},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Conquests of the Longbow - German DOS (suplied by markcoolio in bug report #2727681)
@@ -458,8 +431,7 @@
{"resource.005", 0, "d036df0872f2db19bca34601276be2d7", 1176914},
{"resource.006", 0, "b367a6a59f29ee30dde1d88a5a41152d", 1123585},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Eco Quest - English DOS Non-Interactive Demo (from FRG)
@@ -469,8 +441,7 @@
{"resource.map", 0, "c819e171359b7c95f4c13b846d5c034e", 873},
{"resource.001", 0, "baf9393a9bfa73098adb501e5bc5487b", 657518},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Eco Quest - English DOS CD 1.1
@@ -479,8 +450,7 @@
{"resource.map", 0, "a4b73d5d2b55bdb6e44345e99c8fbdd0", 4804},
{"resource.000", 0, "d908dbef56816ac6c60dd145fdeafb2b", 3536046},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Eco Quest - English DOS Floppy
@@ -492,8 +462,7 @@
{"resource.002", 0, "28fe9b4f0567e71feb198bc9f3a2c605", 1241816},
{"resource.003", 0, "f3146df0ad4297f5ce35aa8c4753bf6c", 586832},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Eco Quest - English DOS Floppy
@@ -505,8 +474,7 @@
{"resource.002", 0, "323b3b12f43d53f27d259beb225f0aa7", 1129316},
{"resource.003", 0, "83ac03e4bddb2c1ac2d36d2a587d0536", 1145616},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Eco Quest - German DOS Floppy (supplied by markcoolio in bug report #2723744)
@@ -518,8 +486,7 @@
{"resource.002", 0, "02d7d0411f7903aacb3bc8b0f8ca8a9a", 1202581},
{"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1175835},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Eco Quest - Spanish DOS Floppy (from jvprat)
@@ -532,8 +499,7 @@
{"resource.002", 0, "2d21a1d2dcbffa551552e3e0725d2284", 1186033},
{"resource.003", 0, "84dd11b6825255671c703aee5ceff620", 1174993},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Eco Quest - French DOS Floppy (from Strangerke)
@@ -545,8 +511,7 @@
{"resource.002", 0, "b836c6ee9de67d814ac5d1b05f5b9858", 1173872},
{"resource.003", 0, "f8f767f9d6351432621c6e54c1b2ba8c", 1141520},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Eco Quest 2 - English DOS Non-Interactive Demo
@@ -555,8 +520,7 @@
{"resource.map", 0, "607cfa0d8a03b7d348c06ee727e3d939", 1321},
{"resource.000", 0, "dd6f614c43c029f063e93cd243af90a4", 525992},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Eco Quest 2 - English DOS Floppy (supplied by markcoolio in bug report #2723761)
@@ -565,8 +529,7 @@
{"resource.map", 0, "28fb7b6abb9fc1cb8882d7c2e701b63f", 5658},
{"resource.000", 0, "cc1d17e5637528dbe4a812699e1cbfc6", 4208192},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Eco Quest 2 - French DOS Floppy (from Strangerke)
@@ -575,8 +538,7 @@
{"resource.map", 0, "c22ab8b33c339c138b6b1697b77b9e79", 5588},
{"resource.000", 0, "1c4093f7248240329121fdf8c0d59152", 4231946},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - English DOS demo (from FRG)
@@ -585,8 +547,7 @@
{"resource.map", 0, "97aa9fcfe84c9993a64debd28c32393a", 1909},
{"resource.000", 0, "5ea8e7a3ea10cce6efd5c106dc62fd8c", 867724},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - English CD (from FRG)
@@ -595,8 +556,7 @@
{"resource.map", 0, "d46b282f228a67ba13bd4b4009e95f8f", 6058},
{"resource.000", 0, "ee3c64ffff0ba9fb08bea2624631c598", 5490246},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - English DOS Floppy (updated information from markcoolio in bug reports #2723773 and #2724720)
@@ -607,8 +567,7 @@
{"resource.000", 0, "96b07e9b914dba1c8dc6c78a176326df", 5233230},
{"resource.msg", 0, "554f65315d851184f6e38211489fdd8f", -1},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - German DOS Floppy (from Tobis87, updated information from markcoolio in bug reports #2723772 and #2724720)
@@ -619,8 +578,7 @@
{"resource.000", 0, "96b07e9b914dba1c8dc6c78a176326df", 5233230},
{"resource.msg", 0, "304b5a5781800affd2235152a5794fa8", -1},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - Spanish DOS (from jvprat)
@@ -634,8 +592,7 @@
{"resource.003", 0, "05acdc256c742e79c50b9fe7ec2cc898", 863310},
{"resource.msg", 0, "45b5bf74933ac3727e4cc844446dc052", 796156},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - Spanish DOS (from jvprat)
@@ -646,8 +603,7 @@
{"resource.000", 0, "96b07e9b914dba1c8dc6c78a176326df", 5233230},
{"resource.msg", 0, "45b5bf74933ac3727e4cc844446dc052", 796156},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Freddy Pharkas - English DOS CD Demo
@@ -656,8 +612,7 @@
{"resource.map", 0, "a62a7eae85dd1e6b07f39662b278437e", 1918},
{"resource.000", 0, "4962a3c4dd44e36e78ea4a7a374c2220", 957382},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Fun Seeker's Guide - English DOS
@@ -666,8 +621,7 @@
{"resource.map", 0, "7ee6859ef74314f6d91938c3595348a9", 282},
{"resource.001", 0, "f1e680095424e31f7fae1255d36bacba", 40692},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Gabriel Knight - English DOS CD Demo
@@ -676,8 +630,7 @@
{"resource.map", 0, "39645952ae0ed8072c7e838f31b75464", 2490},
{"resource.000", 0, "eb3ed7477ca4110813fe1fcf35928561", 1718450},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
#ifdef ENABLE_SCI32
@@ -687,8 +640,7 @@
{"resource.map", 0, "372d059f75856afa6d73dd84cbb8913d", 10783},
{"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight - English DOS Floppy (supplied my markcoolio in bug report #2723777)
@@ -697,8 +649,7 @@
{"resource.map", 0, "65e8c14092e4c9b3b3538b7602c8c5ec", 10783},
{"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 13022630},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight - German DOS Floppy (supplied my markcoolio in bug report #2723775)
@@ -707,8 +658,7 @@
{"resource.map", 0, "ad6508b0296b25c07b1f58828dc33696", 10789},
{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13077029},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight - English DOS CD (from jvprat)
@@ -717,8 +667,7 @@
{"resource.map", 0, "372d059f75856afa6d73dd84cbb8913d", 10996},
{"resource.000", 0, "69b7516962510f780d38519cc15fcc7c", 12581736},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight - German DOS CD (from Tobis87)
@@ -727,8 +676,7 @@
{"resource.map", 0, "a7d3e55114c65647310373cb390815ba", 11392},
{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13400497},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight - Spanish DOS CD (from jvprat)
@@ -737,8 +685,7 @@
{"resource.map", 0, "7cb6e9bba15b544ec7a635c45bde9953", 11404},
{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13381599},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight 2 - English Windows Non-Interactive Demo
@@ -747,8 +694,7 @@
{"resource.map", 0, "e0effce11c4908f4b91838741716c83d", 1351},
{"resource.000", 0, "d04cfc7f04b6f74d13025378be49ec2b", 4640330},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Gabriel Knight 2 - English DOS (from jvprat)
// Executable scanning reports "2.100.002", VERSION file reports "1.1"
@@ -766,8 +712,7 @@
{"resmap.006", 0, "ce9359037277b7d7976da185c2fa0aad", 2977},
{"ressci.006", 0, "8e44e03890205a7be12f45aaba9644b4", 60659424},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
#endif // ENABLE_SCI32
@@ -779,8 +724,7 @@
{"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 342309},
{"resource.003", 0, "e0dd44069a62a463fd124974b915f10d", 328912},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Hoyle 1 - English DOS (supplied by merkur in bug report #2719227)
@@ -789,8 +733,7 @@
{"resource.map", 0, "1034a218943d12f1f36e753fa10c95b8", 4386},
{"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 518308},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
#if 0 // TODO: unknown if these files are corrupt
@@ -801,8 +744,7 @@
{"resource.001", 0, "e0dd44069a62a463fd124974b915f10d", 218755},
{"resource.002", 0, "e0dd44069a62a463fd124974b915f10d", 439502},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
#endif
@@ -813,8 +755,7 @@
{"resource.001", 0, "8f2dd70abe01112eca464cda818b5eb6", 98138},
{"resource.002", 0, "8f2dd70abe01112eca464cda818b5eb6", 196631},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Hoyle 2 - English Amiga (from www.back2roots.org)
@@ -824,8 +765,7 @@
{"resource.map", 0, "62ed48d20c580e5a98f102f7cd93706a", 1356},
{"resource.001", 0, "8f2dd70abe01112eca464cda818b5eb6", 222704},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
#if 0 // TODO: unknown if these files are corrupt
@@ -837,8 +777,7 @@
{"resource.000", 0, "595b6039ea1356e7f96a52c58eedcf22", 355791},
{"resource.001", 0, "143df8aef214a2db34c2d48190742012", 632273},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
#endif
@@ -849,8 +788,7 @@
{"resource.map", 0, "0d06cacc87dc21a08cd017e73036f905", 735},
{"resource.001", 0, "24db2bccda0a3c43ac4a7b5edb116c7e", 797678},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Hoyle 3 - English DOS Floppy (from jvprat)
@@ -861,8 +799,7 @@
{"resource.000", 0, "6ef28cac094dcd97fdb461662ead6f92", 541845},
{"resource.001", 0, "0a98a268ee99b92c233a0d7187c1f0fa", 845795},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Hoyle 4 - English DOS Demo
@@ -871,8 +808,7 @@
{"resource.map", 0, "662087cb383e52e3cc4ae7ecb10e20aa", 938},
{"resource.000", 0, "24c10844792c54d476d272213cbac300", 675252},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
#if 0
@@ -883,8 +819,7 @@
{"resource.001", 0, "bac3ec6cb3e3920984ab0f32becf5163", 313476},
{"resource.002", 0, "b86daa3ba2784d1502da881eedb80d9b", 719747},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
#endif
@@ -898,8 +833,7 @@
{"resource.003", 0, "9ae2a13708d691cd42f9129173c4b39d", 763224},
{"resource.004", 0, "9ae2a13708d691cd42f9129173c4b39d", 820443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// King's Quest 1 SCI Remake - English DOS Non-Interactive Demo
@@ -908,8 +842,7 @@
{"resource.map", 0, "59b13619078bd47011421468959ee5d4", 954},
{"resource.001", 0, "4cfb9040db152868f7cb6a1e8151c910", 296555},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// King's Quest 1 SCI Remake - English DOS (from the King's Quest Collection)
@@ -921,8 +854,7 @@
{"resource.002", 0, "fed9e0072ffd511d248674e60dee2099", 714062},
{"resource.003", 0, "fed9e0072ffd511d248674e60dee2099", 717478},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// King's Quest 4 - English Amiga (from www.back2roots.org)
@@ -936,8 +868,7 @@
{"resource.003", 0, "fd16c9c223f7dc5b65f06447615224ff", 683016},
{"resource.004", 0, "3fac034c7d130e055d05bc43a1f8d5f8", 549993},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// King's Quest 4 - English DOS Non-Interactive Demo
@@ -946,8 +877,7 @@
{"resource.map", 0, "992ac7cc31d3717fe53818a9bb6d1dae", 594},
{"resource.001", 0, "143e1c14f15ad0fbfc714f648a65f661", 205330},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// King's Quest 4 - English DOS (from the King's Quest Collection)
@@ -960,8 +890,7 @@
{"resource.003", 0, "77615c595388acf3d1df8e107bfb6b52", 707591},
{"resource.004", 0, "77615c595388acf3d1df8e107bfb6b52", 479562},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// King's Quest 4 - English DOS
@@ -976,8 +905,7 @@
{"resource.006", 0, "851a62d00972dc4002f472cc0d84e71d", 333777},
{"resource.007", 0, "851a62d00972dc4002f472cc0d84e71d", 341038},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// King's Quest 4 - English DOS
@@ -992,8 +920,7 @@
{"resource.006", 0, "0c8566848a76eea19a6d6220914030a7", 337288},
{"resource.007", 0, "0c8566848a76eea19a6d6220914030a7", 343882},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// King's Quest 5 - English Amiga (from www.back2roots.org)
@@ -1010,8 +937,7 @@
{"resource.006", 0, "26c0c25399b6715fec03fc3e12544fe3", 823048},
{"resource.007", 0, "b914b5901e786327213e779725d30dd1", 778772},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - German Amiga
@@ -1028,8 +954,7 @@
{"resource.006", 0, "56546b20db11a4836f900efa6d3a3e74", 672099},
{"resource.007", 0, "56546b20db11a4836f900efa6d3a3e74", 794194},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - Italian Amiga
@@ -1046,8 +971,7 @@
{"resource.006", 0, "11cb750f5f816445ad0f4b9f50a4f59a", 672527},
{"resource.007", 0, "11cb750f5f816445ad0f4b9f50a4f59a", 794259},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - English DOS CD (from the King's Quest Collection)
@@ -1058,8 +982,7 @@
{"resource.000", 0, "449471bfd77be52f18a3773c7f7d843d", 571368},
{"resource.001", 0, "b45a581ff8751e052c7e364f58d3617f", 16800210},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - English DOS Floppy
@@ -1075,8 +998,7 @@
{"resource.006", 0, "672ede1136e9e401658538e51bd5dc22", 1172619},
{"resource.007", 0, "2f48faf27666b58c276dda20f91f4a93", 1240456},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - German DOS Floppy (supplied by markcoolio in bug report #2727101)
@@ -1092,8 +1014,7 @@
{"resource.006", 0, "d1a75fdc01840664d00366cff6919366", 1208972},
{"resource.007", 0, "c07494f0cce7c05210893938786a955b", 1337361},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - French DOS Floppy (from the King's Quest Collector's Edition 1994)
@@ -1110,8 +1031,7 @@
{"resource.006", 0, "f7dc85307632ef657ceb1651204f6f51", 1210081},
{"resource.007", 0, "7db4d0a1d8d547c0019cb7d2a6acbdd4", 1338473},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - Italian DOS Floppy (from glorifindel)
@@ -1127,8 +1047,7 @@
{"resource.006", 0, "8eeabd92af71e766e323db2100879102", 1209325},
{"resource.007", 0, "dc10c107e0923b902326a040b9c166b9", 1337859},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #2725722)
@@ -1144,8 +1063,7 @@
{"resource.006", 0, "da82e4beb744731d0a151f1d4922fafa", 1170456},
{"resource.007", 0, "431def14ca29cdb5e6a5e84d3f38f679", 1240176},
{NULL, 0, NULL, 0}}, Common::PL_POL, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// King's Quest 6 - English DOS Non-Interactive Demo
@@ -1156,8 +1074,7 @@
{"resource.000", 0, "535b1b920441ec73f42eaa4ccfd47b89", 264116},
{"resource.msg", 0, "54d1fdc936f98c81f9e4c19e04fb1510", 8260},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// King's Quest 6 - English DOS Floppy
@@ -1167,8 +1084,7 @@
{"resource.000", 0, "f2b7f753992c56a0c7a08d6a5077c895", 7863324},
{"resource.msg", 0, "3cf5de44de36191f109d425b8450efc8", 258590},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// King's Quest 6 - German DOS Floppy (supplied by markcoolio in bug report #2727156)
@@ -1178,8 +1094,7 @@
{"resource.000", 0, "f2b7f753992c56a0c7a08d6a5077c895", 7863324},
{"resource.msg", 0, "756297b2155db9e43f621c6f6fb763c3", 282822},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// King's Quest 6 - English Windows CD (from the King's Quest Collection)
@@ -1189,8 +1104,7 @@
{"resource.map", 0, "7a550ebfeae2575ca00d47703a6a774c", 9215},
{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376352},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// King's Quest 6 - Spanish DOS CD (from jvprat)
@@ -1201,8 +1115,7 @@
{"resource.000", 0, "4da3ad5868a775549a7cc4f72770a58e", 8537260},
{"resource.msg", 0, "41eed2d3893e1ca6c3695deba4e9d2e8", 267102},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
#ifdef ENABLE_SCI32
@@ -1212,8 +1125,7 @@
{"resource.map", 0, "2be9ab94429c721af8e05c507e048a15", 18697},
{"resource.000", 0, "eb63ea3a2c2469dc2d777d351c626404", 203882535},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// King's Quest 7 - English DOS (from FRG)
@@ -1222,8 +1134,7 @@
{"resource.map", 0, "8676b0fbbd7362989a029fe72fea14c6", 18709},
{"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// King's Quest 7 - German Windows (supplied by markcoolio in bug report #2727402)
@@ -1232,8 +1143,7 @@
{"resource.map", 0, "838b9ff132bd6962026fee832e8a7ddb", 18697},
{"resource.000", 0, "eb63ea3a2c2469dc2d777d351c626404", 206626576},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// King's Quest 7 - Spanish DOS (from jvprat)
@@ -1242,8 +1152,7 @@
{"resource.map", 0, "0b62693cbe87e3aaca3e8655a437f27f", 18709},
{"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// King's Quest 7 - English DOS Non-Interactive Demo
@@ -1252,8 +1161,7 @@
{"resource.map", 0, "b44f774108d63faa1d021101221c5a54", 1690},
{"resource.000", 0, "d9659d2cf0c269c6a9dc776707f5bea0", 2433827},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
#endif // ENABLE_SCI32
@@ -1269,8 +1177,7 @@
{"resource.004", 0, "aa553977f7e5804081de293800d3bcce", 695067},
{"resource.005", 0, "bfd870d51dc97729f0914095f58e6957", 676881},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Laura Bow - English Atari ST (from jvprat)
@@ -1283,8 +1190,7 @@
{"resource.003", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 667365},
{"resource.004", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 683737},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAtariST, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Laura Bow - English DOS Non-Interactive Demo
@@ -1293,8 +1199,7 @@
{"resource.map", 0, "e625726268ff4e123ada11f31f0249f3", 768},
{"resource.001", 0, "0c8912290af0890f8d95faeb4ddb2d68", 333031},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Laura Bow - English DOS 3.5" Floppy (from "The Roberta Williams Anthology"/1996)
@@ -1306,8 +1211,7 @@
{"resource.003", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 667468},
{"resource.004", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 683807},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Laura Bow - English DOS (from FRG)
@@ -1322,8 +1226,7 @@
{"resource.006", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 328390},
{"resource.007", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 317687},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Laura Bow - German DOS (from Tobis87)
@@ -1338,8 +1241,7 @@
{"resource.006", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 328390},
{"resource.007", 0, "e45c888d9c7c04aec0a20e9f820b79ff", 317687},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Laura Bow 2 - English DOS Non-Interactive Demo (from FRG)
@@ -1349,8 +1251,7 @@
{"resource.map", 0, "24dffc5db1d88c7999f13e8767ed7346", 855},
{"resource.000", 0, "2b2b1b4f7584f9b38fd13f6ab95634d1", 781912},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Laura Bow 2 - English DOS Floppy
@@ -1360,8 +1261,7 @@
{"resource.map", 0, "610bfd9a852004222f0faaf5fc9e630a", 6489},
{"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5035964},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Laura Bow 2 - English DOS CD (from "The Roberta Williams Antology"/1996)
@@ -1371,8 +1271,7 @@
{"resource.map", 0, "a70945e61ba7ac7bfea6b7bd72c6aec5", 7274},
{"resource.000", 0, "82578b8d5a7e09c4c58891ca49fae35b", 5598672},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Laura Bow 2 v1.1 - German DOS Floppy (from Tobis87, updated info from markcoolio in bug report #2723787, updated info from #2797962))
@@ -1382,8 +1281,7 @@
{"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5028766},
{"resource.msg", 0, "795c928cd00dfec9fbc62ebcd12e1f65", 303185},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Laura Bow 2 - Spanish DOS CD (from jvprat)
@@ -1393,8 +1291,7 @@
{"resource.000", 0, "57084910bc923bff5d6d9bc1b56e9604", 5028766},
{"resource.msg", 0, "71f1f0cd9f082da2e750c793a8ed9d84", 286141},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Larry 1 EGA Remake - English DOS (from spookypeanut)
@@ -1406,8 +1303,7 @@
{"resource.002", 0, "24c958bc922b07f91e25e8c93aa01fcf", 491230},
{"resource.003", 0, "685cd6c1e05a695ab1e0db826337ee2a", 553279},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 1 VGA Remake - English Amiga (from www.back2roots.org)
@@ -1420,8 +1316,7 @@
{"resource.002", 0, "5790ac0505f7ca98d4567132b875eb1e", 681041},
{"resource.003", 0, "4a34c3367c2fe7eb380d741374da1989", 572251},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 1 VGA Remake - English DOS (from spookypeanut)
@@ -1432,8 +1327,7 @@
{"resource.001", 0, "ec20246209d7b19f38989261e5c8f5b8", 1111226},
{"resource.002", 0, "85d6935ef77e6b0e16bc307640a0d913", 1088312},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 1 VGA Remake - English DOS (from FRG)
@@ -1444,8 +1338,7 @@
{"resource.001", 0, "d34cadb11e1aefbb497cf91bc1d3baa7", 1114688},
{"resource.002", 0, "85b030bb66d5342b0a068f1208c431a8", 1078443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 1 VGA Remake - English DOS Non-Interactive Demo
@@ -1454,8 +1347,7 @@
{"resource.map", 0, "434e1f6c39d71647b34f0ee57b2bbd68", 444},
{"resource.001", 0, "0c0768215c562d9dace4a5ca53696cf3", 359913},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 1 VGA Remake - Spanish DOS (from the Leisure Suit Larry Collection)
@@ -1469,8 +1361,7 @@
{"resource.002", 0, "3fe2a3aec0ed53c7d6db1845a67e3aa2", 1095908},
{"resource.003", 0, "ac175df0ea9a2cba57f0248651856d27", 376556},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 1 VGA Remake - Russian DOS
@@ -1482,8 +1373,7 @@
{"resource.001", 0, "bc8ca10c807515d959cbd91f9ba47735", 1123759},
{"resource.002", 0, "b7409ab32bc3bee2d6cce887cd33f2b6", 1092160},
{NULL, 0, NULL, 0}}, Common::RU_RUS, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 2 - English Amiga (from www.back2roots.org)
@@ -1496,8 +1386,7 @@
{"resource.003", 0, "a0d4a625311d307257da7fc43d00459d", 570356},
{"resource.004", 0, "a0d4a625311d307257da7fc43d00459d", 717844},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 2 - English DOS Non-Interactive Demo
@@ -1507,8 +1396,7 @@
{"resource.map", 0, "03dba704bb77da55a91ad27b5a3cac09", 528},
{"resource.001", 0, "9f5520f0297206928df0b0b36493cd33", 127532},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 2 - English DOS
@@ -1522,8 +1410,7 @@
{"resource.005", 0, "4a24443a25e2b1492462a52809605dc2", 277732},
{"resource.006", 0, "4a24443a25e2b1492462a52809605dc2", 345683},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 2 - English DOS
@@ -1537,8 +1424,7 @@
{"resource.005", 0, "96033f57accfca903750413fd09193c8", 274953},
{"resource.006", 0, "96033f57accfca903750413fd09193c8", 345818},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 3 - English Amiga (from www.back2roots.org)
@@ -1553,8 +1439,7 @@
{"resource.004", 0, "f408e59cbee1457f042e5773b8c53951", 651634},
{"resource.005", 0, "433911eb764089d493aed1f958a5615a", 524259},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Larry 3 - English DOS
@@ -1566,8 +1451,7 @@
{"resource.003", 0, "f18441027154292836b973c655fa3175", 506807},
{"resource.004", 0, "f18441027154292836b973c655fa3175", 513651},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 3 - English DOS
@@ -1582,8 +1466,7 @@
{"resource.006", 0, "f18441027154292836b973c655fa3175", 282465},
{"resource.007", 0, "f18441027154292836b973c655fa3175", 257174},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 3 - English DOS Non-Interactive Demo
@@ -1593,8 +1476,7 @@
{"resource.001", 0, "f773d79b93dfd4052ec8c1cc64c1e6ab", 76525},
{"resource.002", 0, "f773d79b93dfd4052ec8c1cc64c1e6ab", 268299},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 3 - German DOS (from Tobis87, updated info from markcoolio in bug report #2723832)
@@ -1607,8 +1489,7 @@
{"resource.003", 0, "3827a9b17b926e12dcc336860f50612a", 587036},
{"resource.004", 0, "3827a9b17b926e12dcc336860f50612a", 691932},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 3 - French DOS (provided by richiefs in bug report #2670691)
@@ -1621,8 +1502,7 @@
{"resource.003", 0, "65f1bdaa20f6d0470e9d969f22473873", 586921},
{"resource.004", 0, "65f1bdaa20f6d0470e9d969f22473873", 690826},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Larry 5 - English Amiga
@@ -1638,8 +1518,7 @@
{"resource.005", 0, "f8b2d1137bb767e5d232056b99dd69eb", 623621},
{"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 715598},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - German Amiga
@@ -1656,8 +1535,7 @@
{"resource.006", 0, "bafc64e3144f115dc58c6aee02de98fb", 754966},
{"resource.007", 0, "59eba83ad465b08d763b44f86afa86f6", 683135},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - English DOS Non-Interactive Demo (from FRG)
@@ -1666,8 +1544,7 @@
{"resource.map", 0, "efe8d3f45ce4f6bd9a6643e0ac8d2a97", 504},
{"resource.001", 0, "8bd8d9c0b5f455ee1269d63ce86c50dd", 531380},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - English DOS (from spookypeanut)
@@ -1683,8 +1560,7 @@
{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1024810},
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 1030656},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - German DOS (from Tobis87)
@@ -1700,8 +1576,7 @@
{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1021774},
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 993408},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - French DOS (provided by richiefs in bug report #2670691)
@@ -1718,8 +1593,7 @@
{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 946540},
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 958842},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - Spanish DOS (from the Leisure Suit Larry Collection)
@@ -1736,8 +1610,7 @@
{"resource.006", 0, "dda27ce00682aa76198dac124bbbe334", 1015136},
{"resource.007", 0, "ac443fae1285fb359bf2b2bc6a7301ae", 987222},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 5 - Italian DOS Floppy (from glorifindel)
@@ -1746,8 +1619,7 @@
{"resource.map", 0, "a99776df795127f387cb35dae872d4e4", 5919},
{"resource.000", 0, "a8989a5a89e7d4f702b26b378c7a357a", 7001981},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Larry 6 - English DOS (from spookypeanut)
@@ -1756,8 +1628,7 @@
{"resource.map", 0, "bb8a39d9e2a77ba449a1e591109ad9a8", 6973},
{"resource.000", 0, "4462fe48c7452d98fddcec327a3e738d", 5789138},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Larry 6 - English/German/French DOS CD - LORES
@@ -1766,8 +1637,7 @@
{"resource.map", 0, "0b91234b7112782962cb480b7791b6e2", 7263},
{"resource.000", 0, "57d5fe8bb9e044158514476ea7678eb0", 5754790},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Larry 6 - German DOS CD - LORES (provided by richiefs in bug report #2670691)
@@ -1776,8 +1646,7 @@
{"resource.map", 0, "bafe85f32738854135991d4324ad147e", 7268},
{"resource.000", 0, "f6cbc6da7b90ea135883e0759848ca2c", 5773160},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Larry 6 - French DOS CD - LORES (provided by richiefs in bug report #2670691)
@@ -1786,8 +1655,7 @@
{"resource.map", 0, "97797ea775baaf18a1907d357d3c0ea6", 7268},
{"resource.000", 0, "f6cbc6da7b90ea135883e0759848ca2c", 5776092},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Larry 6 - Spanish DOS - LORES (from the Leisure Suit Larry Collection)
@@ -1796,8 +1664,7 @@
{"resource.map", 0, "633bf8f42170b6271019917c8009989b", 6943},
{"resource.000", 0, "7884a8db9253e29e6b37a2651fd90ba3", 5733116},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Leisure Suit Larry's Casino - English DOS (from the Leisure Suit Larry Collection)
@@ -1806,8 +1673,7 @@
{"resource.map", 0, "194f1578f2624db813c9072359ad1639", 783},
{"resource.001", 0, "3733433b517ec3d14a3331d9ab3842ae", 344830},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
#ifdef ENABLE_SCI32
@@ -1817,8 +1683,7 @@
{"resource.map", 0, "0c0804434ea62278dd15032b1947426c", 8872},
{"resource.000", 0, "9a9f4870504444cda863dd14d077a680", 18520872},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 6 - German DOS CD - HIRES (provided by richiefs in bug report #2670691)
@@ -1827,8 +1692,7 @@
{"resource.map", 0, "badfdf446ffed569a310d2c63a249421", 8896},
{"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18534274},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 6 - French DOS CD - HIRES (provided by richiefs in bug report #2670691)
@@ -1837,8 +1701,7 @@
{"resource.map", 0, "d184e9aa4f2d4b5670ddb3669db82cda", 8896},
{"resource.000", 0, "bd944d2b06614a5b39f1586906f0ee88", 18538987},
{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 7 - English DOS CD (from spookypeanut)
@@ -1847,8 +1710,7 @@
{"resmap.000", 0, "eae93e1b1d1ccc58b4691c371281c95d", 8188},
{"ressci.000", 0, "89353723488219e25589165d73ed663e", 66965678},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 7 - German DOS (from Tobis87)
@@ -1857,8 +1719,7 @@
{"resmap.000", 0, "c11e6bfcfc2f2d05da47e5a7df3e9b1a", 8188},
{"ressci.000", 0, "a8c6817bb94f332ff498a71c8b47f893", 66971724},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 7 - French DOS (provided by richiefs in bug report #2670691)
@@ -1867,8 +1728,7 @@
{"resmap.000", 0, "4407849fd52fe3efb0c30fba60cd5cd4", 8206},
{"ressci.000", 0, "dc37c3055fffbefb494ff22b145d377b", 66964472},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 7 - Italian DOS CD (from glorifindel)
@@ -1877,8 +1737,7 @@
{"resmap.000", 0, "9852a97141f789413f29bf956052acdb", 8212},
{"ressci.000", 0, "440b9fed89590abb4e4386ed6f948ee2", 67140181},
{NULL, 0, NULL, 0}}, Common::IT_ITA, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 7 - Spanish DOS (from the Leisure Suit Larry Collection)
@@ -1887,8 +1746,7 @@
{"resmap.000", 0, "8f3d603e1acc834a5d598b30cdfc93f3", 8188},
{"ressci.000", 0, "32792f9bc1bf3633a88b382bb3f6e40d", 67071418},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Larry 7 - English DOS Demo (provided by richiefs in bug report #2670691)
@@ -1897,8 +1755,7 @@
{"ressci.000", 0, "5cc6159688b2dc03790a67c90ccc67f9", 10195878},
{"resmap.000", 0, "6a2b2811eef82e87cde91cf1de845af8", 2695},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Lighthouse - English Windows Demo (from jvprat)
@@ -1907,8 +1764,7 @@
{"resource.map", 0, "543124606352bfa5e07696ddf2a669be", 64},
{"resource.000", 0, "5d7714416b612463d750fb9c5690c859", 28952},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Lighthouse - English Windows Demo
@@ -1917,8 +1773,7 @@
{"resmap.000", 0, "3bdee7a16926975a4729f75cf6b80a92", 1525},
{"ressci.000", 0, "3c585827fa4a82f4c04a56a0bc52ccee", 11494351},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Lighthouse - English DOS (from jvprat)
@@ -1929,8 +1784,7 @@
{"resmap.002", 0, "c68db5333f152fea6ca2dfc75cad8b34", 7573},
{"ressci.002", 0, "175468431a979b9f317c294ce3bc1430", 94628315},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Lighthouse - Spanish DOS (from jvprat)
@@ -1941,8 +1795,7 @@
{"resmap.002", 0, "e7dc85884a2417e2eff9de0c63dd65fa", 7630},
{"ressci.002", 0, "3c8d627c555b0e3e4f1d9955bc0f0df4", 94631127},
{NULL, 0, NULL, 0}}, Common::ES_ESP, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
#endif // ENABLE_SCI32
@@ -1952,8 +1805,7 @@
{"resource.000", 0, "8be56a3a88c065ee00c02c0e29199f3a", 14643},
{"resource.001", 0, "9e33566515b18bee7915db448063bba2", 871853},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Mixed-Up Fairy Tales v1.000 - English DOS (supplied by markcoolio in bug report #2723791)
@@ -1966,8 +1818,7 @@
{"resource.003", 0, "b1288e0821ee358d1ffe877e5900c8ec", 1047565},
{"resource.004", 0, "f79daa70390d73746742ffcfc3dc4471", 937580},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Mixed-Up Fairy Tales - English DOS Floppy (from jvprat)
@@ -1979,8 +1830,7 @@
{"resource.002", 0, "564f516d991032e781492592a4eaa275", 1414142},
{"resource.003", 0, "dd6cef0c592eadb7e6be9a25307c57a2", 1344719},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Mixed-Up Mother Goose - English Amiga (from www.back2roots.org)
@@ -1991,8 +1841,7 @@
{"resource.001", 0, "fb552ae550ca1dac19ed8f6a3767612d", 262885},
{"resource.002", 0, "fb552ae550ca1dac19ed8f6a3767612d", 817191},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Mixed-Up Mother Goose v2.000 - English DOS Floppy (supplied by markcoolio in bug report #2723795)
@@ -2001,8 +1850,7 @@
{"resource.map", 0, "52aae15e493cafd1da7e1c9b657a5bb9", 7026},
{"resource.000", 0, "b7ecd8ae9e254e80310b5a668b276e6e", 2948975},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Mixed-Up Mother Goose - English DOS CD (from jvprat)
@@ -2012,8 +1860,7 @@
{"resource.map", 0, "1c7f311b0a2c927b2fbe81ae341fb2f6", 5790},
{"resource.001", 0, "5a0ed1d745855148364de1b3be099bac", 4369438},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_0
+ 0
},
// Mixed-Up Mother Goose - English Windows Interactive Demo
@@ -2022,8 +1869,7 @@
{"resource.map", 0, "87f9dc1cafc4d4fa835fb2f00cf3a6ef", 4560},
{"resource.001", 0, "5a0ed1d745855148364de1b3be099bac", 2070072},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
#ifdef ENABLE_SCI32
@@ -2033,8 +1879,7 @@
{"resource.map", 0, "5159a1578c4306bfe070a3e4d8c2e1d3", 4741},
{"resource.000", 0, "1926925c95d82f0999590e93b02887c5", 15150768},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NONE},
- 0,
- SCI_VERSION_32
+ 0
},
#endif // ENABLE_SCI32
@@ -2044,8 +1889,7 @@
{"resource.map", 0, "5b457cbe5042f557e5b610148171f6c0", 1158},
{"resource.001", 0, "453ea81ef66a50cbe33ce06302afe47f", 229737},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
#ifdef ENABLE_SCI32
@@ -2067,8 +1911,7 @@
{"resmap.007", 0, "afbd16ea77869a720afa1c5371de107d", 7972},
//{"ressci.007", 0, "3aae6559aa1df273bc542d5ac6330d75", 25859038},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Phantasmagoria 2 - English Windows (from jvprat)
@@ -2085,8 +1928,7 @@
{"resmap.005", 0, "8bd5ceeedcbe16dfe55d1b90dcd4be84", 1942},
{"ressci.005", 0, "05f9fe2bee749659acb3cd2c90252fc5", 67905112},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
#endif // ENABLE_SCI32
@@ -2096,8 +1938,7 @@
{"resource.map", 0, "72726dc81c1b4c1110c486be77369bc8", 5179},
{"resource.000", 0, "670d0c53622429f4b11275caf7f8d292", 5459574},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Pepper - English DOS Non-Interactive Demo
@@ -2106,8 +1947,7 @@
{"resource.map", 0, "379bb4fb896630b14f2d91ed21e36ba1", 984},
{"resource.000", 0, "118f6c31a93ec7fd9a231c61125229e3", 645494},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Pepper - English DOS/Windows Interactive Demo
@@ -2116,8 +1956,7 @@
{"resource.map", 0, "975e8df76106a5c13d12ab674f906a02", 2514},
{"resource.000", 0, "e6a918a2dd7a4bcecd8fb389f43287c2", 1698164},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Pepper - English DOS Interactive Demo
@@ -2126,8 +1965,7 @@
{"resource.map", 0, "9c9b7b900651a370dd3fb38d478b1798", 2524},
{"resource.000", 0, "e6a918a2dd7a4bcecd8fb389f43287c2", 1713544},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Police Quest 1 VGA Remake - English DOS (from the Police Quest Collection)
@@ -2136,8 +1974,7 @@
{"resource.map", 0, "35efa814fb994b1cbdac9611e401da67", 5013},
{"resource.000", 0, "e0d5ddf34eda903a38f0837e2aa7145b", 6401433},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Police Quest 2 - English Amiga (from www.back2roots.org)
@@ -2149,8 +1986,7 @@
{"resource.002", 0, "499737c21a28ac026e11ab817100d610", 511099},
{"resource.003", 0, "e008f5d6e2a7c4d4a0da0173e4fa8f8b", 553970},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Police Quest 2 - English DOS Non-Interactive Demo
@@ -2159,8 +1995,7 @@
{"resource.map", 0, "8b77d0d4650c2052b356cece28294b58", 576},
{"resource.001", 0, "376ef6d6eaaeed66e1424bd219c4b9ab", 215398},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Police Quest 2 - English DOS (provided by richiefs in bug report #2670691)
@@ -2174,8 +2009,7 @@
{"resource.005", 0, "77f02def3094af804fd2371db25b7100", 349899},
{"resource.006", 0, "77f02def3094af804fd2371db25b7100", 354991},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Police Quest 2 - English DOS (from the Police Quest Collection)
@@ -2186,8 +2020,7 @@
{"resource.002", 0, "77f02def3094af804fd2371db25b7100", 546000},
{"resource.003", 0, "77f02def3094af804fd2371db25b7100", 591851},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Police Quest 2 - English DOS (from FRG)
@@ -2198,8 +2031,7 @@
{"resource.002", 0, "77f02def3094af804fd2371db25b7100", 542897},
{"resource.003", 0, "77f02def3094af804fd2371db25b7100", 586857},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Police Quest 3 - English Amiga
@@ -2213,8 +2045,7 @@
{"resource.003", 0, "630bfa65beb05f743552704ac2899dae", 759891},
{"resource.004", 0, "7b229fbdf30d670d0728cede3e984a7e", 838663},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Police Quest 3 - German Amiga
@@ -2229,8 +2060,7 @@
{"resource.004", 0, "6258d5dd85898d8e218eb8113ebc9059", 722738},
{"resource.005", 0, "6258d5dd85898d8e218eb8113ebc9059", 704485},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Police Quest 3 - English DOS (from the Police Quest Collection)
@@ -2244,8 +2074,7 @@
{"resource.003", 0, "8791b9eef53edf77c2dac950142221d3", 1159791},
{"resource.004", 0, "1b91e891a3c60a941dac0eecdf83375b", 1143606},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Police Quest 3 - English DOS Non-Interactive Demo
@@ -2256,8 +2085,7 @@
{"resource.000", 0, "277f97771f7a6d89677141f02da313d6", 65150},
{"resource.001", 0, "5c5a551b6c86cce2ee75becb90e0b586", 624411},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Police Quest 3 - German DOS (supplied by markcoolio in bug report #2723837)
@@ -2271,8 +2099,7 @@
{"resource.003", 0, "4836f460f4cfc8de61e2df4c45775504", 1180956},
{"resource.004", 0, "0c3eb84b9755852d9e795e0d5c9373c7", 1171760},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1
+ 0
},
// Police Quest 4 - English DOS Non-Interactive Demo (from FRG)
@@ -2281,8 +2108,7 @@
{"resource.map", 0, "be56f87a1c4a13062a30a362df860c2f", 1472},
{"resource.000", 0, "527d5684016e6816157cd15d9071b11b", 1121310},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
#ifdef ENABLE_SCI32
@@ -2292,8 +2118,7 @@
{"resource.map", 0, "379dfe80ed6bd16c47e4b950c4722eac", 11374},
{"resource.000", 0, "fd316a09b628b7032248139003369022", 18841068},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Police Quest 4 - English DOS
@@ -2302,8 +2127,7 @@
{"resource.map", 0, "aed9643158ccf01b71f359db33137f82", 9895},
{"resource.000", 0, "da383857b3be1e4514daeba2524359e0", 15141432},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Police Quest 4 - German DOS (supplied by markcoolio in bug report #2723840)
@@ -2312,8 +2136,7 @@
{"resource.map", 0, "2393ee728ab930b2762cb5889f9b5aff", 9256},
{"resource.000", 0, "6ba98bd2e436739d87ecd2a9b99cabb4", 14730155},
{NULL, 0, NULL, 0}}, Common::DE_DEU, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Police Quest: SWAT - English DOS/Windows Demo (from jvprat)
@@ -2322,8 +2145,7 @@
{"resource.map", 0, "8c96733ef94c21526792f7ca4e3f2120", 1648},
{"resource.000", 0, "d8892f1b8c56c8f7704325460f49b300", 3676175},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
// Police Quest: SWAT - English Windows (from the Police Quest Collection)
@@ -2338,8 +2160,7 @@
{"resmap.004", 0, "4228038906f041623e65789500b22285", 6835},
{"ressci.004", 0, "b7e619e6ecf62fe65d5116a3a422e5f0", 46223872},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_32
+ 0
},
#endif // ENABLE_SCI32
@@ -2353,8 +2174,7 @@
{"resource.003", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 642203},
{"resource.004", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 641688},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Quest for Glory 1 / Hero's Quest - English DOS 5.25" Floppy (supplied by markcoolio in bug report #2723843)
@@ -2370,8 +2190,7 @@
{"resource.006", 0, "69366c2a2f99917199fe1b60a4fee19d", 267852},
{"resource.007", 0, "7ab2bf8e224b57f75e0cd6e4ba790761", 272747},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- GF_FOR_SCI0_BEFORE_629,
- SCI_VERSION_0
+ GF_FOR_SCI0_BEFORE_629
},
// Quest for Glory 1 - Japanese PC-98 5.25" Floppy
@@ -2382,8 +2201,7 @@
{"resource.002", 0, "a21451ef6fa8179bd4b22c4950004c44", 1136968},
{"resource.003", 0, "a21451ef6fa8179bd4b22c4950004c44", 769897},
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Quest for Glory 1 - Japanese PC-98 5.25" Floppy
@@ -2394,8 +2212,7 @@
{"resource.002", 0, "a21451ef6fa8179bd4b22c4950004c44", 1147121},
{"resource.003", 0, "a21451ef6fa8179bd4b22c4950004c44", 777575},
{NULL, 0, NULL, 0}}, Common::JA_JPN, Common::kPlatformPC98, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Quest for Glory 1 - English Amiga
@@ -2410,8 +2227,7 @@
{"resource.004", 0, "16cd4414c37ae3bb6d6da33dce8e25e8", 689124},
{"resource.005", 0, "5f3386ef2f2b1254e4a066f5d9027324", 609529},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Quest for Glory 1 - English DOS
@@ -2424,8 +2240,7 @@
{"resource.003", 0, "951299a82a8134ed12c5c18118d45c2f", 640483},
{"resource.004", 0, "951299a82a8134ed12c5c18118d45c2f", 644443},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_0
+ 0
},
// Quest for Glory 1 VGA Remake - English DOS
@@ -2434,8 +2249,7 @@
{"resource.map", 0, "a731fb6c9c0b282443f7027bc8694d4c", 8469},
{"resource.000", 0, "ecace1a2771846b1a8aa1afdd44111a0", 6570147},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Quest for Glory 1 VGA Remake - English DOS Non-Interactive Demo (from FRG)
@@ -2444,8 +2258,7 @@
{"resource.map", 0, "ac0257051c95a59c0cdc0be24d9b11fa", 729},
{"resource.000", 0, "ec6f5cf369054dd3e5392995e9975b9e", 768218},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_1_1
+ 0
},
// Quest for Glory 2 - English Amiga
@@ -2462,8 +2275,7 @@
{"resource.006", 0, "ccf5dba33e5cab6d5872838c0f8db44c", 500039},
{"resource.007", 0, "4c9fc1587545879295cb9627f56a2cb8", 575056},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Quest for Glory 2 - English (from FRG)
@@ -2476,8 +2288,7 @@
{"resource.003", 0, "b192607c42f6960ecdf2ad2e4f90e9bc", 972804},
{"resource.004", 0, "cd2de58e27665d5853530de93fae7cd6", 983617},
{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
- 0,
- SCI_VERSION_01
+ 0
},
// Quest for Glory 2 - English DOS
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list