diff options
| author | Travis Howell | 2005-05-23 09:30:43 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-23 09:30:43 +0000 |
| commit | 28e156df838341c2bb03e41f9ba22c51988358e9 (patch) | |
| tree | 16560bc8a3f30ee75767ca48f83b031507cda405 /scumm/scumm.cpp | |
| parent | 37d4e9499dd66963f3770c423dd50e655023beea (diff) | |
| download | scummvm-rg350-28e156df838341c2bb03e41f9ba22c51988358e9.tar.gz scummvm-rg350-28e156df838341c2bb03e41f9ba22c51988358e9.tar.bz2 scummvm-rg350-28e156df838341c2bb03e41f9ba22c51988358e9.zip | |
Add Sprite class and move over related functions.
svn-id: r18230
Diffstat (limited to 'scumm/scumm.cpp')
| -rw-r--r-- | scumm/scumm.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 9d69bf1995..7b6b28cea4 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1372,6 +1372,12 @@ ScummEngine_v80he::ScummEngine_v80he(GameDetector *detector, OSystem *syst, cons _heSBNGId = 0; } +ScummEngine_v90he::ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex) + : ScummEngine_v80he(detector, syst, gs, md5sum, substResFileNameIndex) { + + _sprite = new Sprite(this); +} + ScummEngine_v90he::~ScummEngine_v90he() { if (_heversion >= 98) { delete _logicHE; @@ -1830,7 +1836,7 @@ void ScummEngine_v90he::scummInit() { _heObjectNum = 0; _hePaletteNum = 0; - spritesResetTables(0); + _sprite->spritesResetTables(0); memset(&_wizParams, 0, sizeof(_wizParams)); if (_features & GF_HE_CURSORLESS) @@ -2262,8 +2268,8 @@ load_game: #ifndef DISABLE_HE if (_heversion >= 90) { - ((ScummEngine_v90he *)this)->spritesBlitToScreen(); - ((ScummEngine_v90he *)this)->spritesSortActiveSprites(); + ((ScummEngine_v90he *)this)->_sprite->spritesBlitToScreen(); + ((ScummEngine_v90he *)this)->_sprite->spritesSortActiveSprites(); } #endif @@ -2323,7 +2329,7 @@ load_game: #ifndef DISABLE_HE if (_heversion >= 90) { - ((ScummEngine_v90he *)this)->spritesUpdateImages(); + ((ScummEngine_v90he *)this)->_sprite->spritesUpdateImages(); } if (_heversion >= 98) { ((ScummEngine_v90he *)this)->_logicHE->endOfFrame(); |