From f3e81b5f17872186f7c67a551876dd78f268865c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 22 Mar 2017 04:11:49 +0200
Subject: FULLPIPE: Use Common::String in all scene object names

---
 engines/fullpipe/interaction.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'engines/fullpipe/interaction.cpp')

diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 84b8fbc3c5..856552a8b1 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -428,7 +428,6 @@ Interaction::Interaction() {
 	_staticsId2 = 0;
 	_field_28 = 0;
 	_sceneId = -1;
-	_actionName = 0;
 }
 
 Interaction::~Interaction() {
@@ -438,8 +437,6 @@ Interaction::~Interaction() {
 	}
 
 	delete _messageQueue;
-
-	free(_actionName);
 }
 
 bool Interaction::load(MfcArchive &file) {
@@ -496,20 +493,20 @@ bool Interaction::canInteract(GameObject *obj1, GameObject *obj2, int invId) {
 
 	if (_objectState1) {
 		if (_flags & 0x10) {
-			if ((g_fp->getObjectState(obj1->getName()) & _objectState1) == 0)
+			if ((g_fp->getObjectState(obj1->getName().c_str()) & _objectState1) == 0)
 				return false;
 		} else {
-			if (g_fp->getObjectState(obj1->getName()) != _objectState1)
+			if (g_fp->getObjectState(obj1->getName().c_str()) != _objectState1)
 				return false;
 		}
 	}
 
 	if (_objectState2) {
 		if (_flags & 0x10) {
-			if ((g_fp->getObjectState(obj2->getName()) & _objectState2) == 0)
+			if ((g_fp->getObjectState(obj2->getName().c_str()) & _objectState2) == 0)
 				return false;
 		} else {
-			if (g_fp->getObjectState(obj2->getName()) != _objectState2)
+			if (g_fp->getObjectState(obj2->getName().c_str()) != _objectState2)
 				return false;
 		}
 	}
-- 
cgit v1.2.3