Ticket #8865: rtz_saturn_5-22-09.diff

common/util.cpp

@@ -250 +250 @@
 
 
 const PlatformDescription g_platforms[] = {
-        {"2gs", "2gs", "2gs", "Apple IIgs", kPlatformApple2GS },
+        {"2gs", "2gs", "2gs", "Apple IIgs", kPlatformApple2GS},
         {"3do", "3do", "3do", "3DO", kPlatform3DO},
         {"acorn", "acorn", "acorn", "Acorn", kPlatformAcorn},
         {"amiga", "ami", "amiga", "Amiga", kPlatformAmiga},
         {"atari", "atari-st", "st", "Atari ST", kPlatformAtariST},
         {"c64", "c64", "c64", "Commodore 64", kPlatformC64},
-        {"pc", "dos", "ibm", "DOS", kPlatformPC},
-        {"pc98", "pc98", "pc98", "PC-98", kPlatformPC98},
-        {"wii", "wii", "wii", "Nintendo Wii", kPlatformWii},
 
         // The 'official' spelling seems to be "FM-TOWNS" (e.g. in the Indy4 demo).
         // However, on the net many variations can be seen, like "FMTOWNS",
@@ -267 +264 @@
 
         {"linux", "linux", "linux", "Linux", kPlatformLinux},
         {"macintosh", "mac", "mac", "Macintosh", kPlatformMacintosh},
-        {"pce", "pce", "pce", "PC-Engine", kPlatformPCEngine },
         {"nes", "nes", "nes", "NES", kPlatformNES},
+        {"pc", "dos", "ibm", "DOS", kPlatformPC},
+        {"pc98", "pc98", "pc98", "PC-98", kPlatformPC98},
+        {"pce", "pce", "pce", "PC-Engine", kPlatformPCEngine},
+        {"playstation", "psx", "PSX", "Playstation", kPlatformPSX},
+        {"saturn", "saturn", "saturn", "Sega Saturn", kPlatformSaturn},
         {"segacd", "segacd", "sega", "SegaCD", kPlatformSegaCD},
         {"windows", "win", "win", "Windows", kPlatformWindows},
-        {"playstation", "psx", "PSX", "Playstation", kPlatformPSX},
+        {"wii", "wii", "wii", "Nintendo Wii", kPlatformWii},
 
 
         {0, 0, 0, "Default", kPlatformUnknown}

common/util.h

@@ -210 +210 @@
         kPlatformSegaCD,
         kPlatform3DO,
         kPlatformPCEngine,
-
         kPlatformApple2GS,
         kPlatformPC98,
         kPlatformWii,
         kPlatformPSX,
+        kPlatformSaturn,
 
         kPlatformUnknown = -1
 };

engines/made/cpkplayer.cpp

@@ +1 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/scummsys.h"
+#include "common/endian.h"
+ 
+#include "made/cpkplayer.h"
+#include "made/screen.h"
+
+#include "sound/adpcm.h"
+
+namespace Made {
+
+CpkPlayer::CpkPlayer(MadeEngine *vm, Audio::Mixer *mixer) : _fd(NULL), _vm(vm), _mixer(mixer) {
+}
+
+CpkPlayer::~CpkPlayer() {
+}
+
+struct SampleTableEntry {
+        uint32 offset;
+        uint32 length;
+        uint32 sampleInfo1;
+        uint32 sampleInfo2;
+};
+
+void CpkPlayer::play(const char *filename) {
+
+        // Note: Most of this code is based off the document from http://wiki.multimedia.cx/index.php?title=Sega_FILM
+
+        _abort = false;
+        _surface = new Graphics::Surface();
+
+        _fd = new Common::File();
+        _fd->open(filename);
+
+        // FILM Chunk
+        assert(_fd->readUint32BE() == MKID_BE('FILM'));
+        uint32 filmHeaderLength = _fd->readUint32BE();
+        uint32 filmVersion = _fd->readUint32BE();
+        _fd->readUint32BE(); // Reserved???
+        
+        // FDSC Chunk
+        assert(_fd->readUint32BE() == MKID_BE('FDSC'));
+        uint32 fdscChunkSize = _fd->readUint32BE();
+        uint32 videoCodec = _fd->readUint32BE();
+        uint32 height = _fd->readUint32BE();
+        uint32 width = _fd->readUint32BE();
+        _fd->readByte(); // Unknown
+        byte audioChannels = _fd->readByte();
+        byte audioSamplingBits = _fd->readByte();
+        _fd->readByte(); // Unknown
+        uint16 audioFrequency = _fd->readUint16BE();
+        
+        // STAB Chunk
+        assert(_fd->readUint32BE() == MKID_BE('STAB'));
+        uint32 stabChunkSize = _fd->readUint32BE();
+        uint32 frameRateBaseFreq = _fd->readUint32BE();
+        uint32 sampleTableEntryCount = _fd->readUint32BE();
+        SampleTableEntry *sampleTableEntries = new SampleTableEntry[sampleTableEntryCount];
+        for (uint32 i = 0; i < sampleTableEntryCount; i++) {
+                sampleTableEntries[i].offset = _fd->readUint32BE();
+                sampleTableEntries[i].length = _fd->readUint32BE();
+                sampleTableEntries[i].sampleInfo1 = _fd->readUint32BE();
+                sampleTableEntries[i].sampleInfo2 = _fd->readUint32BE();
+        }
+        
+        // Where's the actual frame rate? There is none! It's variable and can differ between frames.
+
+        _mixer->stopAll();
+
+        byte audioFlags = 0;
+        if (audioChannels == 2)
+                audioFlags |= Audio::Mixer::FLAG_STEREO;
+        if (audioSamplingBits == 16)
+                audioFlags |= Audio::Mixer::FLAG_16BITS;
+        
+        _audioStream = Audio::makeAppendableAudioStream(audioFrequency, audioFlags);
+        
+        
+        // Uh-oh.... is it 8bpp???
+        _surface->create(width, height, 1);
+
+        for (uint32 i = 0; i < sampleTableEntryCount && !_abort && !_fd->eos(); i++) {
+                _fd->seek(sampleTableEntries[i].offset + filmHeaderLength);
+                
+                // Audio Data
+                if (sampleTableEntries[i].sampleInfo1 == (uint32)~0) {
+                        Common::SeekableSubReadStream *soundData = new Common::SeekableSubReadStream(_fd, 0, sampleTableEntries[i].length);
+                        Audio::AudioStream *adpcmStream = Audio::makeADPCMStream(soundData, false, 0, Audio::kADPCMMS, audioFrequency, audioChannels, 0);
+                        // TODO: L R L R L R L R
+                        // The Sound data alternates left/right
+                } else {
+                // Video Data
+                        // TODO: Cinepak for SEGA
+                }
+
+                handleEvents();
+                updateScreen();
+        }
+
+        _audioStream->finish();
+        _mixer->stopHandle(_audioStreamHandle);
+        
+        //delete _audioStream;
+        delete _fd;
+        delete _surface;
+
+}
+
+void CpkPlayer::handleEvents() {
+        Common::Event event;
+        while (_vm->_system->getEventManager()->pollEvent(event)) {
+                switch (event.type) {
+                case Common::EVENT_KEYDOWN:
+                        if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
+                                _abort = true;
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+void CpkPlayer::updateScreen() {
+        _vm->_system->copyRectToScreen((const byte*)_surface->pixels, _surface->pitch, 
+                                                                        (320 - _surface->w) / 2, (200 - _surface->h) / 2, _surface->w, _surface->h);
+        _vm->_system->updateScreen();
+}
+
+}

engines/made/cpkplayer.h

@@ +1 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef MADE_CPKPLAYER_H
+#define MADE_CPKPLAYER_H
+
+#include "common/system.h"
+#include "common/events.h"
+#include "common/file.h"
+#include "common/endian.h"
+#include "graphics/surface.h"
+#include "sound/mixer.h"
+#include "sound/audiostream.h"
+
+#include "made/graphics.h"
+#include "made/sound.h"
+#include "made/made.h"
+
+namespace Made {
+
+class MadeEngine;
+
+class CpkPlayer {
+public:
+        CpkPlayer(MadeEngine *vm, Audio::Mixer *mixer);
+        ~CpkPlayer();
+        void play(const char *filename);
+protected:
+        MadeEngine *_vm;
+        Audio::Mixer *_mixer;
+        Common::File *_fd;
+        Audio::AppendableAudioStream *_audioStream;
+        Audio::SoundHandle _audioStreamHandle;
+        Graphics::Surface *_surface;
+        bool _abort;
+        void handleEvents();
+        void updateScreen();
+};
+
+}
+
+#endif

engines/made/database.cpp

@@ -249 +249 @@
         return _objData + 6;
 }
 
+int ObjectSegaSaturn::load(Common::SeekableReadStream &source) {
+        _freeData = true;
+        source.readUint16BE(); // skip flags
+        uint16 type = source.readUint16BE();
+        if (type == 0x7FFF) {
+                _objSize = source.readUint16BE();
+        } else if (type == 0x7FFE) {
+                _objSize = source.readUint16BE() * 2;
+        } else if (type < 0x7FFE) {
+                byte count1 = source.readByte();
+                byte count2 = source.readByte();
+                _objSize = (count1 + count2) * 2;
+        }
+        source.seek(-6, SEEK_CUR);
+        _objSize += 6;
+        _objData = new byte[_objSize];
+        source.read(_objData, _objSize);
+        return _objSize;
+}
 
+int ObjectSegaSaturn::load(byte *source) {
+        _objData = source;
+        _freeData = false;
+        if (getClass() < 0x7FFE) {
+                _objSize = (getCount1() + getCount2()) * 2;
+        } else {
+                _objSize = getSize();
+        }
+        _objSize += 6;
+        return _objSize;
+}
 
+int ObjectSegaSaturn::save(Common::WriteStream &dest) {
+        // Not implemented/used for version 3 objects
+        return 0;
+}
+
+uint16 ObjectSegaSaturn::getFlags() {
+        return READ_BE_UINT16(_objData);
+}
+
+uint16 ObjectSegaSaturn::getClass() {
+        return READ_BE_UINT16(_objData + 2);
+}
+
+uint16 ObjectSegaSaturn::getSize() {
+        return READ_BE_UINT16(_objData + 4);
+}
+
+byte ObjectSegaSaturn::getCount1() {
+        return _objData[4];
+}
+
+byte ObjectSegaSaturn::getCount2() {
+        return _objData[5];
+}
+
+byte *ObjectSegaSaturn::getData() {
+        return _objData + 6;
+}
+
+int16 ObjectSegaSaturn::getVectorItem(int16 index) {
+        if (getClass() == 0x7FFF) {
+                byte *vector = (byte*)getData();
+                return vector[index];
+        } else if (getClass() == 0x7FFE) {
+                int16 *vector = (int16*)getData();
+                return READ_BE_UINT16(&vector[index]);
+        } else if (getClass() < 0x7FFE) {
+                int16 *vector = (int16*)getData();
+                return READ_BE_UINT16(&vector[index]);
+        } else {
+                // should never reach here
+                error("Unknown object class");
+                return 0;
+        }
+}
+
+void ObjectSegaSaturn::setVectorItem(int16 index, int16 value) {
+        if (getClass() == 0x7FFF) {
+                byte *vector = (byte*)getData();
+                vector[index] = value;
+        } else if (getClass() <= 0x7FFE) {
+                int16 *vector = (int16*)getData();
+                WRITE_BE_UINT16(&vector[index], value);
+        }
+}
+
+
 GameDatabase::GameDatabase(MadeEngine *vm) : _vm(vm) {
 }
 
@@ -809 +896 @@
         return NULL;
 }
 
+// GameDatabaseSegaSaturn
+
+GameDatabaseSegaSaturn::GameDatabaseSegaSaturn(MadeEngine *vm) : GameDatabase(vm) {
+}
+
+int16 GameDatabaseSegaSaturn::getVar(int16 index) {
+        return (int16)READ_BE_UINT16(_gameState + index * 2);
+}
+
+void GameDatabaseSegaSaturn::setVar(int16 index, int16 value) {
+        WRITE_BE_UINT16(_gameState + index * 2, value);
+}
+
+int16 GameDatabaseSegaSaturn::getObjectProperty(int16 objectIndex, int16 propertyId) {
+        if (objectIndex == 0)
+                return 0;
+
+        int16 propertyFlag;
+        int16 *property = findObjectProperty(objectIndex, propertyId, propertyFlag);
+
+        if (property) {
+                return (int16)READ_BE_UINT16(property);
+        } else {
+                return 0;
+        }
+}
+
+int16 GameDatabaseSegaSaturn::setObjectProperty(int16 objectIndex, int16 propertyId, int16 value) {
+        if (objectIndex == 0)
+                return 0;
+
+        int16 propertyFlag;
+        int16 *property = findObjectProperty(objectIndex, propertyId, propertyFlag);
+
+        if (property) {
+                if (propertyFlag == 1) {
+                        WRITE_BE_UINT16(property, value);
+                } else {
+                        warning("GameDatabase::setObjectProperty(%04X, %04X, %04X) Trying to set constant property\n",
+                                objectIndex, propertyId, value);
+                }
+                return value;
+        } else {
+                return 0;
+        }
+}
+
+void GameDatabaseSegaSaturn::load(Common::SeekableReadStream &sourceS) {
+        char header[6];
+        sourceS.read(header, 6);
+        if (strncmp(header, "ADVSYS", 6))
+                warning ("Unexpected database header, expected ADVSYS");
+
+        /*uint32 unk = */sourceS.readUint32LE();
+
+        sourceS.skip(20);
+
+        uint32 objectIndexOffs = sourceS.readUint32BE();
+        uint16 objectCount = sourceS.readUint16BE();
+        _gameStateOffs = sourceS.readUint32BE();
+        _gameStateSize = sourceS.readUint32BE();
+        uint32 objectsOffs = sourceS.readUint32BE();
+        uint32 objectsSize = sourceS.readUint32BE();
+        _mainCodeObjectIndex = sourceS.readUint16BE();
+
+        debug(2, "objectIndexOffs = %08X; objectCount = %d; gameStateOffs = %08X; gameStateSize = %d; objectsOffs = %08X; objectsSize = %d\n", objectIndexOffs, objectCount, _gameStateOffs, _gameStateSize, objectsOffs, objectsSize);
+
+        _gameState = new byte[_gameStateSize];
+        sourceS.seek(_gameStateOffs);
+        sourceS.read(_gameState, _gameStateSize);
+
+        Common::Array<uint32> objectOffsets;
+        sourceS.seek(objectIndexOffs);
+        for (uint32 i = 0; i < objectCount; i++)
+                objectOffsets.push_back(sourceS.readUint32BE());
+
+        for (uint32 i = 0; i < objectCount; i++) {
+                Object *obj = new ObjectSegaSaturn();
+
+                // The LSB indicates if it's a constant or variable object.
+                // Constant objects are loaded from disk, while variable objects exist
+                // in the _gameState buffer.
+
+                if (objectOffsets[i] & 1) {
+                        sourceS.seek(objectsOffs + objectOffsets[i] - 1);
+                        obj->load(sourceS);
+                } else {
+                        obj->load(_gameState + objectOffsets[i]);
+                }
+                _objects.push_back(obj);
+        }
+}
+
+void GameDatabaseSegaSaturn::reloadFromStream(Common::SeekableReadStream &sourceS) {
+        sourceS.seek(_gameStateOffs);
+        sourceS.read(_gameState, _gameStateSize);
+}
+
+bool GameDatabaseSegaSaturn::getSavegameDescription(const char *filename, Common::String &description) {
+        Common::InSaveFile *in;
+        char desc[64];
+        if (!(in = g_system->getSavefileManager()->openForLoading(filename))) {
+                return false;
+        }
+        in->skip(4); // TODO: Verify marker 'SGAM'
+        in->skip(4); // TODO: Verify size
+        in->skip(2); // TODO: Verify version
+        in->read(desc, 64);
+        description = desc;
+        delete in;
+        return true;
+}
+
+int16 GameDatabaseSegaSaturn::savegame(const char *filename, const char *description, int16 version) {
+        Common::OutSaveFile *out;
+        char desc[64];
+        int16 result = 0;
+        uint32 size = 4 + 4 + 2 + _gameStateSize;
+        if (!(out = g_system->getSavefileManager()->openForSaving(filename))) {
+                warning("Can't create file '%s', game not saved", filename);
+                return 6;
+        }
+        strncpy(desc, description, 64);
+        out->writeUint32BE(MKID_BE('SGAM'));
+        out->writeUint32LE(size);
+        out->writeUint16LE(version);
+        out->write(desc, 64);
+        out->write(_gameState, _gameStateSize);
+        delete out;
+        return result;
+}
+
+int16 GameDatabaseSegaSaturn::loadgame(const char *filename, int16 version) {
+        Common::InSaveFile *in;
+        int16 result = 0;
+        //uint32 expectedSize = 4 + 4 + 2 + _gameStateSize;
+        if (!(in = g_system->getSavefileManager()->openForLoading(filename))) {
+                warning("Can't open file '%s', game not loaded", filename);
+                return 1;
+        }
+        in->skip(4); // TODO: Verify marker 'SGAM'
+        in->skip(4); // TODO: Verify size
+        in->skip(2); // TODO: Verify version
+        in->skip(64); // skip savegame description
+        in->read(_gameState, _gameStateSize);
+        delete in;
+        return result;
+}
+
+int16 *GameDatabaseSegaSaturn::findObjectProperty(int16 objectIndex, int16 propertyId, int16 &propertyFlag) {
+        Object *obj = getObject(objectIndex);
+
+        int16 *prop = (int16*)obj->getData();
+        byte count1 = obj->getCount1();
+        byte count2 = obj->getCount2();
+
+        int16 *propPtr1 = prop + count1;
+        int16 *propPtr2 = prop + count2;
+
+        // First see if the property exists in the given object
+        while (count2-- > 0) {
+                if ((READ_BE_UINT16(prop) & 0x3FFF) == propertyId) {
+                        if (READ_BE_UINT16(prop) & 0x4000) {
+                                propertyFlag = 1;
+                                return (int16*)_gameState + READ_BE_UINT16(propPtr1);
+                        } else {
+                                propertyFlag = obj->getFlags() & 1;
+                                return propPtr1;
+                        }
+                }
+                prop++;
+                propPtr1++;
+        }
+
+        // Now check in the object hierarchy of the given object
+        int16 parentObjectIndex = obj->getClass();
+        if (parentObjectIndex == 0) {
+                return NULL;
+        }
+
+        while (parentObjectIndex != 0) {
+
+                obj = getObject(parentObjectIndex);
+
+                prop = (int16*)obj->getData();
+                count1 = obj->getCount1();
+                count2 = obj->getCount2();
+
+                propPtr1 = propPtr2 + count1 - count2;
+                int16 *propertyPtr = prop + count1;
+
+                while (count2-- > 0) {
+                        if (!(READ_BE_UINT16(prop) & 0x8000)) {
+                                if ((READ_BE_UINT16(prop) & 0x3FFF) == propertyId) {
+                                        if (READ_BE_UINT16(prop) & 0x4000) {
+                                                propertyFlag = 1;
+                                                return (int16*)_gameState + READ_BE_UINT16(propPtr1);
+                                        } else {
+                                                propertyFlag = obj->getFlags() & 1;
+                                                return propPtr1;
+                                        }
+                                } else {
+                                        propPtr1++;
+                                }
+                        } else {
+                                if ((READ_BE_UINT16(prop) & 0x3FFF) == propertyId) {
+                                        if (READ_BE_UINT16(prop) & 0x4000) {
+                                                propertyFlag = 1;
+                                                return (int16*)_gameState + READ_BE_UINT16(propertyPtr);
+                                        } else {
+                                                propertyFlag = obj->getFlags() & 1;
+                                                return propertyPtr;
+                                        }
+                                }
+                        }
+                        prop++;
+                        propertyPtr++;
+                }
+
+                parentObjectIndex = obj->getClass();
+
+        }
+
+        return NULL;
+        
+}
+
+const char *GameDatabaseSegaSaturn::getString(uint16 offset) {
+        // Not used in version 3 games
+        return NULL;
+}
+
 } // End of namespace Made

engines/made/database.h

@@ -61 +61 @@
         bool isVector();
 
         int16 getVectorSize();
-        int16 getVectorItem(int16 index);
-        void setVectorItem(int16 index, int16 value);
+        virtual int16 getVectorItem(int16 index);
+        virtual void setVectorItem(int16 index, int16 value);
 
         void dump(const char *filename);
 
@@ -112 +112 @@
 
 };
 
+class ObjectSegaSaturn : public Object {
+public:
+        int load(Common::SeekableReadStream &source);
+        int load(byte *source);
+        int save(Common::WriteStream &dest);
+        uint16 getFlags();
+        uint16 getClass();
+        uint16 getSize();
+        byte getCount1();
+        byte getCount2();
+        byte *getData();
+        
+        int16 getVectorItem(int16 index);
+        void setVectorItem(int16 index, int16 value);
+        
+        bool isConstant() {
+                return !(getFlags() & 1);
+        }
+        
+};
+
 class GameDatabase {
 public:
 
@@ -134 +155 @@
 
         int16 getMainCodeObjectIndex() const { return _mainCodeObjectIndex; }
 
-        int16 getVar(int16 index);
-        void setVar(int16 index, int16 value);
+        virtual int16 getVar(int16 index);
+        virtual void setVar(int16 index, int16 value);
 
         const char *getObjectString(int16 index);
         void setObjectString(int16 index, const char *str);
 
         virtual int16 *findObjectProperty(int16 objectIndex, int16 propertyId, int16 &propertyFlag) = 0;
         virtual const char *getString(uint16 offset) = 0;
-        virtual bool getSavegameDescription(const char *filename, Common::String &description, int16 version) = 0;
+        virtual bool getSavegameDescription(const char *filename, Common::String &description, int16 version) { return false; }
         virtual int16 savegame(const char *filename, const char *description, int16 version) = 0;
         virtual int16 loadgame(const char *filename, int16 version) = 0;
 
-        int16 getObjectProperty(int16 objectIndex, int16 propertyId);
-        int16 setObjectProperty(int16 objectIndex, int16 propertyId, int16 value);
+        virtual int16 getObjectProperty(int16 objectIndex, int16 propertyId);
+        virtual int16 setObjectProperty(int16 objectIndex, int16 propertyId, int16 value);
 
         void dumpObject(int16 index);
 
@@ -193 +214 @@
         void reloadFromStream(Common::SeekableReadStream &sourceS);
 };
 
+class GameDatabaseSegaSaturn : public GameDatabase {
+public:
+        GameDatabaseSegaSaturn(MadeEngine *vm);
+        int16 *findObjectProperty(int16 objectIndex, int16 propertyId, int16 &propertyFlag);
+        const char *getString(uint16 offset);
+        bool getSavegameDescription(const char *filename, Common::String &description);
+        int16 savegame(const char *filename, const char *description, int16 version);
+        int16 loadgame(const char *filename, int16 version);
+        
+        int16 getVar(int16 index);
+        void setVar(int16 index, int16 value);
+        
+        int16 getObjectProperty(int16 objectIndex, int16 propertyId);
+        int16 setObjectProperty(int16 objectIndex, int16 propertyId, int16 value);
+protected:
+        char *_gameText;
+        uint32 _gameStateOffs;
+        void load(Common::SeekableReadStream &sourceS);
+        void reloadFromStream(Common::SeekableReadStream &sourceS);
+};
+
 } // End of namespace Made
 
 #endif /* MADE_H */

engines/made/detection.cpp

@@ -294 +294 @@
                 GF_FLOPPY,
                 3,
         },
+        
+        {
+                // Return to Zork - Japanese Sega Saturn version
+                {
+                        "rtz",
+                        "",
+                        AD_ENTRY1("rtz.dat", "023e46f6b43913792bd535558cce7bf7"),
+                        Common::JA_JPN,
+                        Common::kPlatformSaturn,
+                        ADGF_NO_FLAGS
+                },
+                GID_RTZ,
+                0,
+                GF_FLOPPY,
+                3,
+        },
 
         {
                 // Return to Zork - Demo
@@ -308 +324 @@
                 GID_RTZ,
                 0,
                 GF_DEMO,
-                3,
+                3
         },
 
         {

engines/made/made.cpp

@@ -82 +82 @@
 
         _pmvPlayer = new PmvPlayer(this, _mixer);
         _res = new ResourceReader();
+        _cpkPlayer = new CpkPlayer(this, _mixer);
         _screen = new Screen(this);
 
-        if (getGameID() == GID_LGOP2 || getGameID() == GID_MANHOLE || getGameID() == GID_RODNEY) {
+        if (getVersion() == 1 || getVersion() == 2) {
                 _dat = new GameDatabaseV2(this);
-        } else if (getGameID() == GID_RTZ) {
-                _dat = new GameDatabaseV3(this);
+        } else if (getVersion() == 3) {
+                if (getPlatform() == Common::kPlatformSaturn)
+                        _dat = new GameDatabaseSegaSaturn(this);
+                else
+                        _dat = new GameDatabaseV3(this);
         } else {
                 error("Unknown GameID");
         }

engines/made/made.h

@@ -47 +47 @@
 
 #include "made/sound.h"
 
+#include "made/cpkplayer.h"
+
 namespace Made {
 
 enum MadeGameID {
@@ -68 +70 @@
 struct MadeGameDescription;
 
 class ResourceReader;
+class CpkPlayer;
 class PmvPlayer;
 class Screen;
 class ScriptInterpreter;
@@ -103 +106 @@
 private:
 public:
         PmvPlayer *_pmvPlayer;
+        CpkPlayer *_cpkPlayer;
         ResourceReader *_res;
         Screen *_screen;
         GameDatabase *_dat;
@@ -134 +138 @@
         Common::String getSavegameFilename(int16 saveNum);
 
         void handleEvents();
-
 };
 
 } // End of namespace Made

engines/made/module.mk

@@ -1 +1 @@
 MODULE := engines/made
 
 MODULE_OBJS = \
+        cpkplayer.o \
         database.o \
         detection.o \
         graphics.o \

engines/made/scriptfuncs.cpp

@@ -46 +46 @@
         _externalFuncs.push_back(new ExternalScriptFunc(this, &ScriptFunctions::x));  \
         _externalFuncNames.push_back(#x);
 void ScriptFunctions::setupExternalsTable() {
-
         External(sfSystemCall);
         External(sfInitGraf);
         External(sfRestoreGraf);
@@ -116 +115 @@
         }
 
         if (_vm->getGameID() == GID_RTZ) {
-                External(sfPrintf);
+                if (_vm->getPlatform() != Common::kPlatformSaturn)
+                        External(sfPrintf);
                 External(sfClearMono);
                 External(sfGetSoundEnergy);
                 External(sfClearText);
@@ -151 +151 @@
                 External(sfReadMenu);
                 External(sfDrawMenu);
                 External(sfGetMenuCount);
-                External(sfSaveGame);
-                External(sfLoadGame);
-                External(sfGetGameDescription);
+                if (_vm->getPlatform() == Common::kPlatformSaturn) {
+                        External(sfFaceIcon);
+                } else {
+                        External(sfSaveGame);
+                        External(sfLoadGame);
+                        External(sfGetGameDescription);
+                }
                 External(sfShakeScreen);
                 External(sfPlaceMenu);
                 External(sfSetSoundVolume);
@@ -929 +933 @@
 
 }
 
+int16 ScriptFunctions::sfFaceIcon(int16 argc, int16 *argv) {
+        // TODO: Used in RTZ Sega Saturn
+        warning("Unimplemented opcode: sfFaceIcon");
+        return 0;
+}
+
 int16 ScriptFunctions::sfShakeScreen(int16 argc, int16 *argv) {
         // TODO: Used in RTZ
         warning("Unimplemented opcode: sfShakeScreen");

engines/made/scriptfuncs.h

@@ -161 +161 @@
         int16 sfSaveGame(int16 argc, int16 *argv);
         int16 sfLoadGame(int16 argc, int16 *argv);
         int16 sfGetGameDescription(int16 argc, int16 *argv);
+        int16 sfFaceIcon(int16 argc, int16 *argv);
         int16 sfShakeScreen(int16 argc, int16 *argv);
         int16 sfPlaceMenu(int16 argc, int16 *argv);
         int16 sfSetSoundVolume(int16 argc, int16 *argv);