From 51017cf1b21f450acad9c735e9364f5bb5d35f17 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 17 Sep 2006 20:36:48 +0000
Subject: Renamed ScummEngine::res to _res and allocate the ResourceManager on
 the heap (i.e. _res is a pointer now)

svn-id: r23922
---
 engines/scumm/script_v5.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'engines/scumm/script_v5.cpp')

diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index dbd5e2a77c..887137fe47 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1690,7 +1690,7 @@ void ScummEngine_v5::o5_resourceRoutines() {
 				resid = _resourceMapper[resid & 0x7F];
 
 			if (_currentRoom != resid) {
-				res.setResourceCounter(rtRoom, resid, 1);
+				_res->setResourceCounter(rtRoom, resid, 1);
 			}
 		} else
 			ensureResourceLoaded(rtRoom, resid);
@@ -1703,40 +1703,40 @@ void ScummEngine_v5::o5_resourceRoutines() {
 		if (_game.id == GID_ZAK && (_game.platform == Common::kPlatformFMTowns))
 			error("o5_resourceRoutines %d should not occur in Zak256", op);
 		else
-			res.setResourceCounter(resType[op-5], resid, 0x7F);
+			_res->setResourceCounter(resType[op-5], resid, 0x7F);
 		break;
 	case 9:			// SO_LOCK_SCRIPT
 		if (resid >= _numGlobalScripts)
 			break;
-		res.lock(rtScript, resid);
+		_res->lock(rtScript, resid);
 		break;
 	case 10:		// SO_LOCK_SOUND
-		res.lock(rtSound, resid);
+		_res->lock(rtSound, resid);
 		break;
 	case 11:		// SO_LOCK_COSTUME
-		res.lock(rtCostume, resid);
+		_res->lock(rtCostume, resid);
 		break;
 	case 12:		// SO_LOCK_ROOM
 		if (resid > 0x7F)
 			resid = _resourceMapper[resid & 0x7F];
-		res.lock(rtRoom, resid);
+		_res->lock(rtRoom, resid);
 		break;
 
 	case 13:		// SO_UNLOCK_SCRIPT
 		if (resid >= _numGlobalScripts)
 			break;
-		res.unlock(rtScript, resid);
+		_res->unlock(rtScript, resid);
 		break;
 	case 14:		// SO_UNLOCK_SOUND
-		res.unlock(rtSound, resid);
+		_res->unlock(rtSound, resid);
 		break;
 	case 15:		// SO_UNLOCK_COSTUME
-		res.unlock(rtCostume, resid);
+		_res->unlock(rtCostume, resid);
 		break;
 	case 16:		// SO_UNLOCK_ROOM
 		if (resid > 0x7F)
 			resid = _resourceMapper[resid & 0x7F];
-		res.unlock(rtRoom, resid);
+		_res->unlock(rtRoom, resid);
 		break;
 
 	case 17:		// SO_CLEAR_HEAP
@@ -2286,7 +2286,7 @@ void ScummEngine_v5::o5_stringOps() {
 	case 2:											/* copystring */
 		a = getVarOrDirectByte(PARAM_1);
 		b = getVarOrDirectByte(PARAM_2);
-		res.nukeResource(rtString, a);
+		_res->nukeResource(rtString, a);
 		ptr = getResourceAddress(rtString, b);
 		if (ptr)
 			loadPtrToResource(rtString, a, ptr);
@@ -2314,9 +2314,9 @@ void ScummEngine_v5::o5_stringOps() {
 	case 5:											/* create empty string */
 		a = getVarOrDirectByte(PARAM_1);
 		b = getVarOrDirectByte(PARAM_2);
-		res.nukeResource(rtString, a);
+		_res->nukeResource(rtString, a);
 		if (b) {
-			ptr = res.createResource(rtString, a, b);
+			ptr = _res->createResource(rtString, a, b);
 			if (ptr) {
 				for (i = 0; i < b; i++)
 					ptr[i] = 0;
@@ -2359,7 +2359,7 @@ void ScummEngine_v5::o5_verbOps() {
 		case 2:		// SO_VERB_NAME
 			loadPtrToResource(rtVerb, slot, NULL);
 			if (slot == 0)
-				res.nukeResource(rtVerb, slot);
+				_res->nukeResource(rtVerb, slot);
 			vs->type = kTextVerbType;
 			vs->imgindex = 0;
 			break;
@@ -2479,12 +2479,12 @@ void ScummEngine_v5::o5_verbOps() {
 		case 20:	// SO_VERB_NAME_STR
 			ptr = getResourceAddress(rtString, getVarOrDirectWord(PARAM_1));
 			if (!ptr)
-				res.nukeResource(rtVerb, slot);
+				_res->nukeResource(rtVerb, slot);
 			else {
 				loadPtrToResource(rtVerb, slot, ptr);
 			}
 			if (slot == 0)
-				res.nukeResource(rtVerb, slot);
+				_res->nukeResource(rtVerb, slot);
 			vs->type = kTextVerbType;
 			vs->imgindex = 0;
 			break;
-- 
cgit v1.2.3