From 93982b2ca9b67cd143f603f516570e269f28fa32 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 22 Mar 2017 04:32:23 +0200
Subject: FULLPIPE: Change more object-related functions to use Common::String

---
 engines/fullpipe/fullpipe.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 9c474d111b..32e2ea2862 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -552,7 +552,7 @@ void FullpipeEngine::updateScreen() {
 	++_updateTicks;
 }
 
-int FullpipeEngine::getObjectEnumState(const char *name, const char *state) {
+int FullpipeEngine::getObjectEnumState(Common::String name, const char *state) {
 	GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
 
 	if (!var) {
@@ -569,7 +569,7 @@ int FullpipeEngine::getObjectEnumState(const char *name, const char *state) {
 	return 0;
 }
 
-int FullpipeEngine::getObjectState(const char *objname) {
+int FullpipeEngine::getObjectState(Common::String objname) {
 	GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
 
 	if (var)
@@ -578,7 +578,7 @@ int FullpipeEngine::getObjectState(const char *objname) {
   return 0;
 }
 
-void FullpipeEngine::setObjectState(const char *name, int state) {
+void FullpipeEngine::setObjectState(Common::String name, int state) {
 	GameVar *var = _gameLoader->_gameVar->getSubVarByName("OBJSTATES");
 
 	if (!var) {
-- 
cgit v1.2.3


From abe1c65d626a8f3c9487f87ebbcaeef11721bf6b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 22 Mar 2017 05:22:36 +0200
Subject: FULLPIPE: Change the sound code to use Common::String

---
 engines/fullpipe/fullpipe.cpp | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 32e2ea2862..ea75af1a5a 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -131,10 +131,6 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 
 	_stream2playing = false;
 
-	memset(_sceneTracks, 0, sizeof(_sceneTracks));
-	memset(_trackName, 0, sizeof(_trackName));
-	memset(_sceneTracksCurrentTrack, 0, sizeof(_sceneTracksCurrentTrack));
-
 	_numSceneTracks = 0;
 	_sceneTrackHasSequence = false;
 	_sceneTrackIsPlaying = false;
-- 
cgit v1.2.3