From a331cea358414d8363634d7644a95a82ac7d4ea1 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 10 Feb 2017 02:14:10 +0200 Subject: CRYO: Remove the unused ResourceManager class --- engines/cryo/ResourceManager.cpp | 122 --------------------------------------- engines/cryo/ResourceManager.h | 92 ----------------------------- 2 files changed, 214 deletions(-) delete mode 100644 engines/cryo/ResourceManager.cpp delete mode 100644 engines/cryo/ResourceManager.h (limited to 'engines') diff --git a/engines/cryo/ResourceManager.cpp b/engines/cryo/ResourceManager.cpp deleted file mode 100644 index 79218c598c..0000000000 --- a/engines/cryo/ResourceManager.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/* 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. - * - */ - -#include "ResourceManager.h" - -namespace Cryo { - -ResourceManager::ResourceManager() { -} - -ResourceManager::ResourceManager(const Common::String &datFileName) { - LoadDatFile(datFileName); -} - -ResourceManager::~ResourceManager() { -} - -bool ResourceManager::LoadDatFile(const Common::String &datFileName) { - if (_datFile.isOpen()) { - _datFile.close(); - _files.clear(); - } - - assert(_datFile.open(datFileName)); - - uint16 numFiles = _datFile.readUint16LE(); - - for (uint16 i = 0; i < numFiles; i++) { - DatFileEntry entry; - - _datFile.read(entry._name, sizeof(entry._name)); - entry._size = _datFile.readUint32LE(); - entry._offset = _datFile.readUint32LE(); - entry._flag = _datFile.readByte(); - - _files.push_back(entry); - } - - return true; -} - -Common::SeekableReadStream *ResourceManager::GetFile(const Common::String &resName, unsigned int hintIndex) { - // First, try raw disk file so we can support modding/patching - - if (Common::File::exists(resName)) { - debug("Loading %s from disk", resName); - - Common::File *resource = new Common::File(); - resource->open(resName); - return resource; - } - - // Look inside .dat file - - if (_datFile.isOpen()) { - for (unsigned int i = hintIndex; i < _files.size(); i++) { - if (!resName.compareToIgnoreCase(_files[i]._name)) { - debug("Loading %s from dat file", resName); - Common::SeekableSubReadStream *resource = new Common::SeekableSubReadStream(&_datFile, _files[i]._offset, _files[i]._offset + _files[i]._size); - return resource; - } - } - } - - debug("Unable to load %s - does't exists", resName); - return nullptr; -} - -Common::SeekableReadStream *ResourceManager::GetFile(unsigned int resIndex) { - if (_files.size() > resIndex) { - return GetFile(Common::String(_files[resIndex]._name), resIndex); - } - - return nullptr; -} - -void *ResourceManager::StreamToBuffer(Common::SeekableReadStream *stream, unsigned int *size) { - if (!stream) - return nullptr; - - unsigned int readSize = stream->size(); - byte *data = new byte[readSize + 1]; - readSize = stream->read(data, readSize); - - if (size) - *size = readSize; - return data; -} - -void *ResourceManager::GetData(const Common::String &resName, unsigned int *size) { - Common::SeekableReadStream *resource = GetFile(resName); - void *data = StreamToBuffer(resource, size); - delete resource; - return data; -} - -void *ResourceManager::GetData(int resIndex, unsigned int *size) { - Common::SeekableReadStream *resource = GetFile(resIndex); - void *data = StreamToBuffer(resource, size); - delete resource; - return data; -} -} diff --git a/engines/cryo/ResourceManager.h b/engines/cryo/ResourceManager.h deleted file mode 100644 index 5a587fcaa3..0000000000 --- a/engines/cryo/ResourceManager.h +++ /dev/null @@ -1,92 +0,0 @@ -/* 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. - * - */ - -#pragma once - -#include "common/array.h" -#include "common/file.h" -#include "common/fs.h" -#include "common/str.h" -#include "common/substream.h" -#include "common/debug.h" - -namespace Cryo { - -template -class CryoArray { -private: - byte *_data; - bool _ownData; - uint16 ElementOffset(int num) { - assert(_data && num < Count()) - return (static_cast_data)[num]; - } -public: - CryoArray(void *data, bool ownData) : _data(data), _ownData(ownData) { - } - ~CryoArray() { - if (_ownData) - delete data; - } - uint16 Count() { - return ElementOffset(0) / 2; - } - const T *operator[](int index) { - return static_cast(_data + ElementOffset(num)); - } -}; - -class ResourceManager { -private: - struct DatFileEntry { - char _name[16]; - unsigned int _size; - unsigned int _offset; - byte _flag; - }; - - Common::Array _files; - Common::File _datFile; - - static void *StreamToBuffer(Common::SeekableReadStream *stream, unsigned int *size); - -public: - ResourceManager(const Common::String &datFileName); - ResourceManager(); - ~ResourceManager(); - - bool LoadDatFile(const Common::String &datFileName); - - // Load resource as a seekable stream - Common::SeekableReadStream *GetFile(const Common::String &resName, unsigned int hintIndex = 0); - Common::SeekableReadStream *GetFile(unsigned int resIndex); - - // Load resource as a buffer - void *GetData(const Common::String &resName, unsigned int *size = nullptr); - void *GetData(int resIndex, unsigned int *size = nullptr); - void *operator[](int resIndex) { - return GetData(resIndex); - } - -}; - -} -- cgit v1.2.3