From 577c3b56a528cd58e26882b8924b2a8b9d56148a Mon Sep 17 00:00:00 2001
From: Peter Kohaut
Date: Wed, 12 Oct 2016 23:00:33 +0200
Subject: BLADERUNNER: added picking up of items

and some formatting
---
 engines/bladerunner/script/rc01.cpp   | 3 ---
 engines/bladerunner/script/script.cpp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines/bladerunner/script')

diff --git a/engines/bladerunner/script/rc01.cpp b/engines/bladerunner/script/rc01.cpp
index ebb67b75f3..d94f104403 100644
--- a/engines/bladerunner/script/rc01.cpp
+++ b/engines/bladerunner/script/rc01.cpp
@@ -202,9 +202,6 @@ bool ScriptRC01::MouseClick(int x, int y) {
 }
 
 bool ScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) {
-#if _DEBUG
-	Item_Pickup_Spin_Effect(938, 426, 316);
-#endif
 	if (Object_Query_Click("BARICADE01", objectName)
 		|| Object_Query_Click("BARICADE03", objectName)
 		|| Object_Query_Click("BARICADE04", objectName)
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
index 9e11402b5f..cf607a4b47 100644
--- a/engines/bladerunner/script/script.cpp
+++ b/engines/bladerunner/script/script.cpp
@@ -662,7 +662,7 @@ void ScriptBase::Actor_Set_Immunity_To_Obstacles(int actorId, bool isImmune) {
 }
 
 void ScriptBase::Item_Add_To_World(int itemId, int animationId, int setId, float x, float y, float z, signed int facing, int height, int width, bool isTargetable, bool isObstacle, bool isPoliceMazeEnemy, bool updateOnly) {
-	_vm->_items->add(itemId, animationId, setId, Vector3(x, y, z), facing, height, width, isTargetable, isObstacle, isPoliceMazeEnemy, updateOnly == 0);
+	_vm->_items->addToWorld(itemId, animationId, setId, Vector3(x, y, z), facing, height, width, isTargetable, isObstacle, isPoliceMazeEnemy, updateOnly == 0);
 }
 
 void ScriptBase::Item_Remove_From_World(int itemId) {
-- 
cgit v1.2.3