diff options
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 633097630c..42db57b271 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -884,7 +884,7 @@ void Actor::drawActorCostume() { setupActorScale(); - BaseCostumeRenderer* bcr = _vm->_bcr; + BaseCostumeRenderer* bcr = _vm->_costumeRenderer; bcr->updateNbStrips (); diff --git a/scumm/scumm.h b/scumm/scumm.h index 7f30aeaf90..b4dd2cb6e9 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -421,7 +421,7 @@ protected: public: int _numCostumes; // FIXME - should be protected, used by Actor::remapActorPalette - BaseCostumeRenderer* _bcr; + BaseCostumeRenderer* _costumeRenderer; char *_audioNames; int32 _numAudioNames; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 3596c8d5b5..bd9fb86ff2 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -410,7 +410,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _languageBuffer = NULL; _languageIndex = NULL; memset(_transText, 0, sizeof(_transText)); - _bcr = NULL; + _costumeRenderer = NULL; _2byteFontPtr = 0; // @@ -725,7 +725,7 @@ Scumm::~Scumm () { delete _languageBuffer; delete _audioNames; - delete _bcr; + delete _costumeRenderer; if (_shadowPalette) free(_shadowPalette); @@ -741,12 +741,12 @@ void Scumm::setFeatures (uint32 newFeatures) { _features = newFeatures; - if (!_bcr || newCostumes != newNewCostumes) { - delete _bcr; + if (!_costumeRenderer || newCostumes != newNewCostumes) { + delete _costumeRenderer; if (newNewCostumes) - _bcr = new AkosRenderer(this); + _costumeRenderer = new AkosRenderer(this); else - _bcr = new CostumeRenderer(this); + _costumeRenderer = new CostumeRenderer(this); } } |