diff options
| author | Gregory Montoir | 2007-01-27 02:26:37 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-01-27 02:26:37 +0000 |
| commit | 2b61c0d6c1efba14b23655905751981e9b19e365 (patch) | |
| tree | c3964a11338fc21e7e9542ced5b860fa167c3daf /engines/scumm/charset.cpp | |
| parent | 843b30403163b67ec277f086f3ead587bd50e266 (diff) | |
| download | scummvm-rg350-2b61c0d6c1efba14b23655905751981e9b19e365.tar.gz scummvm-rg350-2b61c0d6c1efba14b23655905751981e9b19e365.tar.bz2 scummvm-rg350-2b61c0d6c1efba14b23655905751981e9b19e365.zip | |
cleanup (made NutRenderer::loadFont protected, added call during initialisation of the renderer object)
svn-id: r25223
Diffstat (limited to 'engines/scumm/charset.cpp')
| -rw-r--r-- | engines/scumm/charset.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp index 165eead6e7..a50e749d0f 100644 --- a/engines/scumm/charset.cpp +++ b/engines/scumm/charset.cpp @@ -1610,8 +1610,6 @@ CharsetRendererNut::CharsetRendererNut(ScummEngine *vm) CharsetRendererNut::~CharsetRendererNut() { for (int i = 0; i < 5; i++) { - if ((_vm->_game.id == GID_CMI) && (_vm->_game.features & GF_DEMO) && (i == 4)) - break; delete _fr[i]; } } @@ -1621,11 +1619,9 @@ void CharsetRendererNut::setCurID(byte id) { assert(id < numFonts); _curId = id; if (!_fr[id]) { - _fr[id] = new NutRenderer(_vm); char fontname[11]; sprintf(fontname, "font%d.nut", id); - _fr[id] = new NutRenderer(_vm); - _fr[id]->loadFont(fontname, true); + _fr[id] = new NutRenderer(_vm, fontname, true); } _current = _fr[id]; assert(_current); |