[Scummvm-cvs-logs] SF.net SVN: scummvm:[41070] scummvm/trunk/engines/made

[fingolfin at users.sourceforge.net]

Revision: 41070
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41070&view=rev
Author:   fingolfin
Date:     2009-05-31 15:07:55 +0000 (Sun, 31 May 2009)

Log Message:
-----------
MADE: cleanup

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

Modified: scummvm/trunk/engines/made/resource.cpp
===================================================================
--- scummvm/trunk/engines/made/resource.cpp	2009-05-31 14:55:32 UTC (rev 41069)
+++ scummvm/trunk/engines/made/resource.cpp	2009-05-31 15:07:55 UTC (rev 41070)
@@ -506,7 +506,7 @@
 }
 
 void ResourceReader::freeResource(Resource *resource) {
-	tossResourceFromCache(resource->slot);
+	tossResourceFromCache(resource->_slot);
 }
 
 bool ResourceReader::loadResource(ResourceSlot *slot, byte *&buffer, uint32 &size) {
@@ -525,8 +525,9 @@
 
 ResourceSlot *ResourceReader::getResourceSlot(uint32 resType, uint index) {
 	ResourceSlots *slots = _resSlots[resType];
+	assert(slots);
 	if (index >= 1 && index < slots->size()) {
-		return &slots->operator[](index);
+		return &(*slots)[index];
 	} else {
 		return NULL;
 	}

Modified: scummvm/trunk/engines/made/resource.h
===================================================================
--- scummvm/trunk/engines/made/resource.h	2009-05-31 14:55:32 UTC (rev 41069)
+++ scummvm/trunk/engines/made/resource.h	2009-05-31 15:07:55 UTC (rev 41070)
@@ -56,9 +56,8 @@
 
 class Resource {
 public:
-	ResourceSlot *slot;
+	ResourceSlot *_slot;
 	virtual ~Resource();
-	virtual void load(byte *buffer, int size) = 0;
 };
 
 class PictureResource : public Resource {
@@ -231,7 +230,7 @@
 
 			if (loadResource(slot, buffer, size)) {
 				res = new T();
-				res->slot = slot;
+				res->_slot = slot;
 				res->load(buffer, size);
 				addResourceToCache(slot, res);
 				delete[] buffer;

Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp	2009-05-31 14:55:32 UTC (rev 41069)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp	2009-05-31 15:07:55 UTC (rev 41070)
@@ -637,7 +637,7 @@
 	int result = 0;
 	if (_vm->_mixer->isSoundHandleActive(_audioStreamHandle) && _vm->_soundEnergyArray) {
 		while (_vm->_soundEnergyIndex < _vm->_soundEnergyArray->size()) {
-			SoundEnergyItem *soundEnergyItem = &_vm->_soundEnergyArray->operator[](_vm->_soundEnergyIndex);
+			SoundEnergyItem *soundEnergyItem = &(*_vm->_soundEnergyArray)[_vm->_soundEnergyIndex];
 			if (((_vm->_soundRate / 1000) * _vm->_mixer->getSoundElapsedTime(_audioStreamHandle)) < soundEnergyItem->position) {
 				result = soundEnergyItem->energy;
 				break;


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