diff options
| author | Max Horn | 2002-12-25 21:04:47 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 21:04:47 +0000 |
| commit | fca9ec09e7709ff4400d2a9a7fd76f4f21781006 (patch) | |
| tree | 2c9dd18841983469c4780c75d90762f8a167c048 /scumm/scummvm.cpp | |
| parent | f1808d20ac90f4212fd14aeaf544a8aaac6a3fbc (diff) | |
| download | scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.gz scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.bz2 scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.zip | |
moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it
svn-id: r6147
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 0baa7f32a8..9b2d6b1554 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -24,6 +24,7 @@ #include "scumm.h" #include "actor.h" #include "bundle.h" +#include "charset.h" #include "debugger.h" #include "dialogs.h" #include "imuse.h" @@ -289,7 +290,7 @@ void Scumm::scummInit() _numObjectsInRoom = 0; _actorToPrintStrFor = 0; - _charset._bufPos = 0; + _charset->_bufPos = 0; _haveMsg = 0; _varwatch = -1; @@ -487,7 +488,7 @@ int Scumm::scummLoop(int delta) if (_completeScreenRedraw) { _completeScreenRedraw = false; gdi.clearUpperMask(); - _charset._hasMask = false; + _charset->_hasMask = false; redrawVerbs(); _fullRedraw = true; } @@ -1557,7 +1558,8 @@ void Scumm::mainRun() void Scumm::launch() { - _charset._vm = this; + _charset = new CharsetRenderer(this); + gdi._vm = this; _maxHeapThreshold = 450000; |