From 7509ffec339ddd09fe9109717a5c35dbfe127671 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 10 Sep 2013 22:36:14 +0300 Subject: FULLPIPE: Move GameObject::canInteractAny() out of the class --- engines/fullpipe/gfx.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'engines/fullpipe/gfx.cpp') diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp index c6024d15e0..e16d56cd8d 100644 --- a/engines/fullpipe/gfx.cpp +++ b/engines/fullpipe/gfx.cpp @@ -343,28 +343,6 @@ void GameObject::renumPictures(CPtrList *lst) { free(buf); } -bool GameObject::canInteractAny(GameObject *obj2, int invId) { - int sceneId = 0; - - if (g_fullpipe->_currentScene) - sceneId = g_fullpipe->_currentScene->_sceneId; - - CInteractionController *intC = getGameLoaderInteractionController(); - for (CObList::iterator i = intC->_interactions.begin(); i != intC->_interactions.end(); ++i) { - CInteraction *intr = (CInteraction *)*i; - - if (intr->_sceneId > 0 && intr->_sceneId != sceneId) - break; - - if (invId == -3) { - invId = getGameLoaderInventory()->getSelectedItemId(); - } - if (intr->canInteract(this, obj2, invId)) - return true; - } - return false; -} - bool GameObject::getPicAniInfo(PicAniInfo *info) { if (_objtype == kObjTypePictureObject) { info->type = 2; -- cgit v1.2.3