diff options
| author | uruk | 2014-07-09 11:33:02 +0200 |
|---|---|---|
| committer | uruk | 2014-07-09 11:33:02 +0200 |
| commit | 5a1383343fb645b5fbd80060da81253b2443bf28 (patch) | |
| tree | 465a5fbddecf55e10df39da836e31bd1b34ff18f /engines/cge2/talk.cpp | |
| parent | 45da1e7c741a1906b60ad3d55a9e0087fd9a4a3e (diff) | |
| download | scummvm-rg350-5a1383343fb645b5fbd80060da81253b2443bf28.tar.gz scummvm-rg350-5a1383343fb645b5fbd80060da81253b2443bf28.tar.bz2 scummvm-rg350-5a1383343fb645b5fbd80060da81253b2443bf28.zip | |
CGE2: Rework number().
Diffstat (limited to 'engines/cge2/talk.cpp')
| -rw-r--r-- | engines/cge2/talk.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/cge2/talk.cpp b/engines/cge2/talk.cpp index eda812333c..fd1c140e04 100644 --- a/engines/cge2/talk.cpp +++ b/engines/cge2/talk.cpp @@ -87,15 +87,11 @@ void Font::load() { char *token; - if ((token = _vm->token(tmpStr)) == nullptr) - error("Wrong line! (%d) in %s", colorFile.getLineCount(), path); - _colorSet[n][0] = _vm->number(token); - - for (int i = 1; i < 4; i++) { - if ((token = _vm->token(nullptr)) == nullptr) - error("Wrong line! (%d) in %s", colorFile.getLineCount(), path); - _colorSet[n][i] = _vm->number(token); - } + + _colorSet[n][0] = _vm->number(tmpStr); + + for (int i = 1; i < 4; i++) + _colorSet[n][i] = _vm->number(nullptr); n++; } |