[Scummvm-cvs-logs] SF.net SVN: scummvm:[49842] scummvm/trunk/engines/sci

[fingolfin at users.sourceforge.net]

Revision: 49842
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49842&view=rev
Author:   fingolfin
Date:     2010-06-15 12:31:37 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: Make Resource::_id protected

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:31:16 UTC (rev 49841)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:31:37 UTC (rev 49842)
@@ -133,7 +133,7 @@
 }
 
 //-- Resource main functions --
-Resource::Resource() {
+Resource::Resource(ResourceId id) : _id(id) {
 	data = NULL;
 	size = 0;
 	_fileOffset = 0;
@@ -1485,9 +1485,8 @@
 void ResourceManager::addResource(ResourceId resId, ResourceSource *src, uint32 offset, uint32 size) {
 	// Adding new resource only if it does not exist
 	if (_resMap.contains(resId) == false) {
-		Resource *res = new Resource;
+		Resource *res = new Resource(resId);
 		_resMap.setVal(resId, res);
-		res->_id = resId;
 		res->_source = src;
 		res->_fileOffset = offset;
 		res->size = size;
@@ -1501,11 +1500,10 @@
 	if (_resMap.contains(resId)) {
 		res = _resMap.getVal(resId);
 	} else {
-		res = new Resource;
+		res = new Resource(resId);
 		_resMap.setVal(resId, res);
 	}
 
-	res->_id = resId;
 	res->_status = kResStatusNoMalloc;
 	res->_source = src;
 	res->_headerSize = 0;

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-15 12:31:16 UTC (rev 49841)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-15 12:31:37 UTC (rev 49842)
@@ -184,20 +184,19 @@
 	friend class AudioVolumeResourceSource;
 	friend class MacResourceForkResourceSource;
 
+// NOTE : Currently most member variables lack the underscore prefix and have
+// public visibility to let the rest of the engine compile without changes.
 public:
-	Resource();
-	~Resource();
-	void unalloc();
-
-// NOTE : Currently all member data has the same name and public visibility
-// to let the rest of the engine compile without changes
-public:
-	ResourceId _id;
 	byte *data;
 	uint32 size;
 	byte *_header;
 	uint32 _headerSize;
 
+public:
+	Resource(ResourceId id);
+	~Resource();
+	void unalloc();
+
 	inline ResourceType getType() const { return _id.getType(); }
 
 	/**
@@ -208,6 +207,7 @@
 	uint32 getAudioCompressionType() const;
 
 protected:
+	ResourceId _id;	// TODO: _id could almost be made const, only readResourceInfo() modifies it...
 	int32 _fileOffset; /**< Offset in file */
 	ResourceStatus _status;
 	uint16 _lockers; /**< Number of places where this resource was locked */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.