From 347035385e3608c3107db7b9cba0673ce9e03a22 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 16 Jan 2012 22:32:46 +0100
Subject: SCUMM: merge object v0 id and type into one object var

---
 engines/scumm/script_v0.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index ac6ee4b9d6..e2ec40ef52 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -365,7 +365,7 @@ uint ScummEngine_v0::fetchScriptWord() {
 
 int ScummEngine_v0::getActiveObject() {
 	if (_opcode & PARAM_2)
-		return OBJECT_V0_NR(_cmdObject);
+		return OBJECT_V0_ID(_cmdObject);
 
 	return fetchScriptByte();
 }
@@ -831,7 +831,7 @@ void ScummEngine_v0::o_doSentence() {
 bool ScummEngine_v0::ifEqualActiveObject2Common(bool checkType) {
 	byte obj = fetchScriptByte();
 	if (!checkType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
-		return (obj == OBJECT_V0_NR(_cmdObject2));
+		return (obj == OBJECT_V0_ID(_cmdObject2));
 	return false;
 }
 
-- 
cgit v1.2.3