From 01176782ead27701b4700f458fbad3f8a84514af Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 2 Oct 2009 14:32:54 +0000
Subject: Fix some cppcheck warnings reported by salty-horse

svn-id: r44538
---
 engines/agos/string.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'engines/agos/string.cpp')

diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 62f06ab12c..40506e4874 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -297,8 +297,6 @@ uint AGOSEngine::loadTextFile_gme(const char *filename, byte *dst) {
 
 void AGOSEngine::loadTextIntoMem(uint16 stringId) {
 	byte *p;
-	char filename[30];
-	int i;
 	uint16 baseMin = 0x8000, baseMax, size;
 
 	_tablesHeapPtr = _tablesheapPtrNew;
@@ -308,13 +306,13 @@ void AGOSEngine::loadTextIntoMem(uint16 stringId) {
 
 	// get filename
 	while (*p) {
-		for (i = 0; *p; p++, i++)
-			filename[i] = *p;
-		filename[i] = 0;
+		Common::String filename;
+		while (*p)
+			filename += *p++;
 		p++;
 
 		if (getPlatform() == Common::kPlatformAcorn) {
-			sprintf(filename, "%s.DAT", filename);
+			filename += ".DAT";
 		}
 
 		baseMax = (p[0] * 256) | p[1];
@@ -330,7 +328,7 @@ void AGOSEngine::loadTextIntoMem(uint16 stringId) {
 			_tablesHeapPtr += size;
 			_tablesHeapCurPos += size;
 
-			size = loadTextFile(filename, _tablesHeapPtr);
+			size = loadTextFile(filename.c_str(), _tablesHeapPtr);
 
 			setupLocalStringTable(_tablesHeapPtr, baseMax - baseMin + 1);
 
-- 
cgit v1.2.3