From 33dc1c88f2975e402f9a44b372ef688e49b51cf5 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Thu, 22 Dec 2016 22:28:57 +0100
Subject: ADL: Make 'room' debug command behave like opcode

---
 engines/adl/adl_v4.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'engines/adl/adl_v4.cpp')

diff --git a/engines/adl/adl_v4.cpp b/engines/adl/adl_v4.cpp
index 456ee10dca..613ffd8832 100644
--- a/engines/adl/adl_v4.cpp
+++ b/engines/adl/adl_v4.cpp
@@ -268,6 +268,14 @@ void AdlEngine_v4::switchRegion(byte region) {
 	_picOnScreen = _roomOnScreen = 0;
 }
 
+void AdlEngine_v4::switchRoom(byte roomNr) {
+	getCurRoom().curPicture = getCurRoom().picture;
+	getCurRoom().isFirstTime = false;
+	backupRoomState(_state.room);
+	_state.room = roomNr;
+	restoreRoomState(_state.room);
+}
+
 int AdlEngine_v4::o4_isItemInRoom(ScriptEnv &e) {
 	OP_DEBUG_2("\t&& GET_ITEM_ROOM(%s) == %s", itemStr(e.arg(1)).c_str(), itemRoomStr(e.arg(2)).c_str());
 
@@ -297,17 +305,6 @@ int AdlEngine_v4::o4_moveItem(ScriptEnv &e) {
 	return 2;
 }
 
-int AdlEngine_v4::o4_setRoom(ScriptEnv &e) {
-	OP_DEBUG_1("\tROOM = %d", e.arg(1));
-
-	getCurRoom().curPicture = getCurRoom().picture;
-	getCurRoom().isFirstTime = false;
-	backupRoomState(_state.room);
-	_state.room = e.arg(1);
-	restoreRoomState(_state.room);
-	return 1;
-}
-
 int AdlEngine_v4::o4_setRegionToPrev(ScriptEnv &e) {
 	OP_DEBUG_0("\tREGION = PREV_REGION");
 
-- 
cgit v1.2.3