STARTREK: Change more fields to Common::String, and fix shadowed vars

1 files changed, 5 insertions, 10 deletions

diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp
index 876499c14b..b2912497d2 100644
--- a/engines/startrek/actors.cpp
+++ b/engines/startrek/actors.cpp
@@ -164,8 +164,7 @@ void StarTrekEngine::updateActorAnimations() {
 					actor->animFile->read(animFrameFilename, 16);
 					sprite->setBitmap(loadAnimationFrame(animFrameFilename, actor->scale));
 
-					memset(actor->bitmapFilename, 0, 10);
-					strncpy(actor->bitmapFilename, animFrameFilename, 9);
+					actor->bitmapFilename = animFrameFilename;
 
 					actor->animFile->seek(10 + actor->animFrame * 22, SEEK_SET);
 					uint16 xOffset = actor->animFile->readUint16();
@@ -430,8 +429,8 @@ void StarTrekEngine::drawActorToScreen(Actor *actor, const Common::String &_anim
 	Common::String animFilename = _animName;
 	if (_animName.hasPrefixIgnoreCase("stnd") /* && word_45d20 == -1 */) // TODO
 		animFilename += 'j';
-	memcpy(actor->animFilename, _animName.c_str(), sizeof(actor->animFilename));
 
+	actor->animFilename = _animName;
 	actor->animType = 2;
 	actor->animFile = loadFile(animFilename + ".anm");
 	actor->numAnimFrames = actor->animFile->size() / 22;
@@ -454,12 +453,10 @@ void StarTrekEngine::drawActorToScreen(Actor *actor, const Common::String &_anim
 		_gfx->addSprite(sprite);
 
 	sprite->setBitmap(loadAnimationFrame(firstFrameFilename, scale));
-	memset(actor->bitmapFilename, 0, sizeof(char) * 10);
-	strncpy(actor->bitmapFilename, firstFrameFilename, sizeof(char) * 9);
-
+	actor->bitmapFilename = firstFrameFilename;
 	actor->scale = scale;
-
 	actor->animFile->seek(10, SEEK_SET);
+
 	uint16 xOffset = actor->animFile->readUint16();
 	uint16 yOffset = actor->animFile->readUint16();
 	uint16 basePriority = actor->animFile->readUint16();
@@ -525,9 +522,7 @@ void StarTrekEngine::updateActorPositionWhileWalking(Actor *actor, int16 x, int1
 	actor->scale = getActorScaleAtPosition(y);
 	Common::String animName = Common::String::format("%s%02d", actor->animationString2.c_str(), actor->field92 & 7);
 	actor->sprite.setBitmap(loadAnimationFrame(animName, actor->scale));
-
-	memset(actor->bitmapFilename, 0, 10);
-	strncpy(actor->bitmapFilename, animName.c_str(), 9);
+	actor->bitmapFilename = animName;
 
 	Sprite *sprite = &actor->sprite;
 	sprite->drawPriority = _gfx->getPriValue(0, y);