diff options
| author | Strangerke | 2014-06-27 01:09:34 +0200 |
|---|---|---|
| committer | Strangerke | 2014-06-27 01:09:34 +0200 |
| commit | e9396f8d1035b771d8c3fe99d8b815a3db39cfe5 (patch) | |
| tree | 7f842cfaf344a3160f9a82ae0f67486a21f2ffc1 /engines/cge2/talk.cpp | |
| parent | 014d6bd9f0d561b0fff4748a46606281042046e0 (diff) | |
| download | scummvm-rg350-e9396f8d1035b771d8c3fe99d8b815a3db39cfe5.tar.gz scummvm-rg350-e9396f8d1035b771d8c3fe99d8b815a3db39cfe5.tar.bz2 scummvm-rg350-e9396f8d1035b771d8c3fe99d8b815a3db39cfe5.zip | |
CGE2: Fix some GCC warnings
Diffstat (limited to 'engines/cge2/talk.cpp')
| -rw-r--r-- | engines/cge2/talk.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/cge2/talk.cpp b/engines/cge2/talk.cpp index a6d9945665..ddd98ac29c 100644 --- a/engines/cge2/talk.cpp +++ b/engines/cge2/talk.cpp @@ -50,7 +50,8 @@ Font::~Font() { } void Font::load() { - char *path = "CGE.CFT"; + char path[10]; + strcpy(path, "CGE.CFT"); if (!_vm->_resman->exist(path)) error("Missing configuration file! %s", path); @@ -67,7 +68,7 @@ void Font::load() { } fontFile.read(_map, p); - path = "CGE.TXC"; + strcpy(path, "CGE.TXC"); if (!_vm->_resman->exist(path)) error("Missing configuration file! %s", path); @@ -84,16 +85,16 @@ void Font::load() { continue; Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr)); - char *p; + char *token; - if ((p = _vm->token(tmpStr)) == NULL) + if ((token = _vm->token(tmpStr)) == NULL) error("Wrong line! (%d) in %s", colorFile.getLineCount(), path); - _colorSet[n][0] = _vm->number(p); + _colorSet[n][0] = _vm->number(token); for (int i = 1; i < 4; i++) { - if ((p = _vm->token(nullptr)) == NULL) + if ((token = _vm->token(nullptr)) == NULL) error("Wrong line! (%d) in %s", colorFile.getLineCount(), path); - _colorSet[n][i] = _vm->number(p); + _colorSet[n][i] = _vm->number(token); } n++; |