[Scummvm-cvs-logs] SF.net SVN: scummvm:[49831] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Jun 15 14:18:08 CEST 2010
Revision: 49831
http://scummvm.svn.sourceforge.net/scummvm/?rev=49831&view=rev
Author: fingolfin
Date: 2010-06-15 12:18:07 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
SCI: Move _associatedMap to VolumeResourceSource and make it const
Modified Paths:
--------------
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/resource_audio.cpp
scummvm/trunk/engines/sci/resource_intern.h
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2010-06-15 12:17:47 UTC (rev 49830)
+++ scummvm/trunk/engines/sci/resource.cpp 2010-06-15 12:18:07 UTC (rev 49831)
@@ -175,7 +175,6 @@
ResourceSource::ResourceSource(ResSourceType type, const Common::String &name, int volNum, const Common::FSNode *resFile)
: _sourceType(type), _name(name), _volumeNumber(volNum), _resourceFile(resFile) {
_scanned = false;
- _associatedMap = NULL;
}
ResourceSource::~ResourceSource() {
Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp 2010-06-15 12:17:47 UTC (rev 49830)
+++ scummvm/trunk/engines/sci/resource_audio.cpp 2010-06-15 12:18:07 UTC (rev 49831)
@@ -417,7 +417,7 @@
Common::List<ResourceSource *>::iterator it = _sources.begin();
while (it != _sources.end()) {
ResourceSource *src = *it;
- if (src->_associatedMap == _audioMapSCI1) {
+ if (src->findVolume(_audioMapSCI1, src->_volumeNumber)) {
it = _sources.erase(it);
delete src;
} else {
Modified: scummvm/trunk/engines/sci/resource_intern.h
===================================================================
--- scummvm/trunk/engines/sci/resource_intern.h 2010-06-15 12:17:47 UTC (rev 49830)
+++ scummvm/trunk/engines/sci/resource_intern.h 2010-06-15 12:18:07 UTC (rev 49831)
@@ -56,7 +56,6 @@
bool _scanned;
const Common::FSNode * const _resourceFile;
const int _volumeNumber;
- ResourceSource *_associatedMap; // TODO: Move to VolumeResourceSource
protected:
ResourceSource(ResSourceType type, const Common::String &name, int volNum = 0, const Common::FSNode *resFile = 0);
@@ -105,15 +104,16 @@
};
class VolumeResourceSource : public ResourceSource {
+protected:
+ ResourceSource * const _associatedMap;
+
public:
VolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum, ResSourceType type = kSourceVolume)
- : ResourceSource(type, name, volNum) {
- _associatedMap = map;
+ : ResourceSource(type, name, volNum), _associatedMap(map) {
}
VolumeResourceSource(const Common::String &name, ResourceSource *map, int volNum, const Common::FSNode *resFile)
- : ResourceSource(kSourceVolume, name, volNum, resFile) {
- _associatedMap = map;
+ : ResourceSource(kSourceVolume, name, volNum, resFile), _associatedMap(map) {
}
virtual ResourceSource *findVolume(ResourceSource *map, int volNum) {
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