diff options
| author | Paul Gilbert | 2018-02-22 22:12:14 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-23 15:23:20 -0500 |
| commit | d132d66c2825cddf215b19d787a2797e8dbad8ed (patch) | |
| tree | c38e5351b7cd0c70fbe5457bf4e46ac69ba22f7c /engines | |
| parent | 6b523a1d04da385d08d5b38f9e51cdb9b6c5fd33 (diff) | |
| download | scummvm-rg350-d132d66c2825cddf215b19d787a2797e8dbad8ed.tar.gz scummvm-rg350-d132d66c2825cddf215b19d787a2797e8dbad8ed.tar.bz2 scummvm-rg350-d132d66c2825cddf215b19d787a2797e8dbad8ed.zip | |
XEEN: Add Clouds of Xeen MAE and Spells to xeen.ccs
The later games stored them in resources, but Clouds of Xeen had
them hardcoded. So this adds them under the same resource names
as the later games, so the existing code can load them
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/files.cpp | 5 | ||||
| -rw-r--r-- | engines/xeen/map.cpp | 10 | ||||
| -rw-r--r-- | engines/xeen/xeen.cpp | 5 | ||||
| -rw-r--r-- | engines/xeen/xeen.h | 1 |
4 files changed, 9 insertions, 12 deletions
diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp index a424bd510b..9cbc36ffc5 100644 --- a/engines/xeen/files.cpp +++ b/engines/xeen/files.cpp @@ -219,7 +219,10 @@ Common::SeekableReadStream *CCArchive::createReadStreamForMember(const Common::S FileManager::FileManager(XeenEngine *vm) { _isDarkCc = vm->getGameID() == GType_DarkSide; - File::_xeenCc = File::_darkCc = nullptr; + File::_xeenCc = File::_darkCc = File::_introCc = nullptr; + File::_xeenSave = File::_darkSave = nullptr; + File::_currentSave = nullptr; + File::_currentArchive = nullptr; } FileManager::~FileManager() { diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp index af50fcd1b2..abe91e57d3 100644 --- a/engines/xeen/map.cpp +++ b/engines/xeen/map.cpp @@ -916,15 +916,15 @@ void Map::load(int mapId) { _wallSprites._surfaces[i].clear(); _wallSprites._fwl1.load(Common::String::format("f%s1.fwl", - Res.TERRAIN_TYPES[_mazeData[0]._wallKind])); + Res.TERRAIN_TYPES[_mazeData[0]._wallKind]), _sidePictures); _wallSprites._fwl2.load(Common::String::format("f%s2.fwl", - Res.TERRAIN_TYPES[_mazeData[0]._wallKind])); + Res.TERRAIN_TYPES[_mazeData[0]._wallKind]), _sidePictures); _wallSprites._fwl3.load(Common::String::format("f%s3.fwl", - Res.TERRAIN_TYPES[_mazeData[0]._wallKind])); + Res.TERRAIN_TYPES[_mazeData[0]._wallKind]), _sidePictures); _wallSprites._fwl4.load(Common::String::format("f%s4.fwl", - Res.TERRAIN_TYPES[_mazeData[0]._wallKind])); + Res.TERRAIN_TYPES[_mazeData[0]._wallKind]), _sidePictures); _wallSprites._swl.load(Common::String::format("s%s.swl", - Res.TERRAIN_TYPES[_mazeData[0]._wallKind])); + Res.TERRAIN_TYPES[_mazeData[0]._wallKind]), _sidePictures); // Set entries in the indoor draw list to the correct sprites // for drawing various parts of the background diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp index 8e22965e2f..39fc773d39 100644 --- a/engines/xeen/xeen.cpp +++ b/engines/xeen/xeen.cpp @@ -56,7 +56,6 @@ XeenEngine::XeenEngine(OSystem *syst, const XeenGameDescription *gameDesc) _sound = nullptr; _spells = nullptr; _windows = nullptr; - _eventData = nullptr; _noDirectionSense = false; _startupWindowActive = false; _quitMode = QMODE_NONE; @@ -80,7 +79,6 @@ XeenEngine::~XeenEngine() { delete _sound; delete _spells; delete _windows; - delete _eventData; delete _resources; delete _files; g_vm = nullptr; @@ -107,9 +105,6 @@ bool XeenEngine::initialize() { _spells = new Spells(this); _windows = new Windows(); - File f("029.obj", 1); - _eventData = f.readStream(f.size()); - // Set graphics mode initGraphics(320, 200); diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h index 652284b26f..561d928158 100644 --- a/engines/xeen/xeen.h +++ b/engines/xeen/xeen.h @@ -158,7 +158,6 @@ public: Windows *_windows; Mode _mode; GameEvent _gameEvent; - Common::SeekableReadStream *_eventData; QuitMode _quitMode; bool _noDirectionSense; bool _startupWindowActive; |