aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-07-09 18:48:16 +0200
committerStrangerke2014-07-09 18:48:16 +0200
commit4d2c1315ac24870ac8b2d53cdc6b274893df7157 (patch)
tree0a733a69519482596b1f4b08e36008f9a32d1a9e
parentfcce50e6fe954ed275de29da60d29cc99ce77008 (diff)
downloadscummvm-rg350-4d2c1315ac24870ac8b2d53cdc6b274893df7157.tar.gz
scummvm-rg350-4d2c1315ac24870ac8b2d53cdc6b274893df7157.tar.bz2
scummvm-rg350-4d2c1315ac24870ac8b2d53cdc6b274893df7157.zip
CGE2: Silence a GCC warning, reduce the scope of a variable
-rw-r--r--engines/cge2/talk.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/engines/cge2/talk.cpp b/engines/cge2/talk.cpp
index fd1c140e04..227e0135bd 100644
--- a/engines/cge2/talk.cpp
+++ b/engines/cge2/talk.cpp
@@ -77,17 +77,12 @@ void Font::load() {
assert(!colorFile.err());
char tmpStr[kLineMax + 1];
- Common::String line;
int n = 0;
- for (line = colorFile.readLine(); !colorFile.eos(); line = colorFile.readLine()){
+ for (Common::String line = colorFile.readLine(); !colorFile.eos(); line = colorFile.readLine()){
if (line.empty())
continue;
Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
-
- char *token;
-
-
_colorSet[n][0] = _vm->number(tmpStr);
for (int i = 1; i < 4; i++)