mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-19 08:25:35 +00:00
renamed _bcr -> _costumeRenderer
svn-id: r8473
This commit is contained in:
parent
af979a4a7a
commit
4e57157cda
@ -884,7 +884,7 @@ void Actor::drawActorCostume() {
|
|||||||
|
|
||||||
setupActorScale();
|
setupActorScale();
|
||||||
|
|
||||||
BaseCostumeRenderer* bcr = _vm->_bcr;
|
BaseCostumeRenderer* bcr = _vm->_costumeRenderer;
|
||||||
|
|
||||||
bcr->updateNbStrips ();
|
bcr->updateNbStrips ();
|
||||||
|
|
||||||
|
@ -421,7 +421,7 @@ protected:
|
|||||||
public:
|
public:
|
||||||
int _numCostumes; // FIXME - should be protected, used by Actor::remapActorPalette
|
int _numCostumes; // FIXME - should be protected, used by Actor::remapActorPalette
|
||||||
|
|
||||||
BaseCostumeRenderer* _bcr;
|
BaseCostumeRenderer* _costumeRenderer;
|
||||||
|
|
||||||
char *_audioNames;
|
char *_audioNames;
|
||||||
int32 _numAudioNames;
|
int32 _numAudioNames;
|
||||||
|
@ -410,7 +410,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
|
|||||||
_languageBuffer = NULL;
|
_languageBuffer = NULL;
|
||||||
_languageIndex = NULL;
|
_languageIndex = NULL;
|
||||||
memset(_transText, 0, sizeof(_transText));
|
memset(_transText, 0, sizeof(_transText));
|
||||||
_bcr = NULL;
|
_costumeRenderer = NULL;
|
||||||
_2byteFontPtr = 0;
|
_2byteFontPtr = 0;
|
||||||
|
|
||||||
//
|
//
|
||||||
@ -725,7 +725,7 @@ Scumm::~Scumm () {
|
|||||||
delete _languageBuffer;
|
delete _languageBuffer;
|
||||||
delete _audioNames;
|
delete _audioNames;
|
||||||
|
|
||||||
delete _bcr;
|
delete _costumeRenderer;
|
||||||
|
|
||||||
if (_shadowPalette)
|
if (_shadowPalette)
|
||||||
free(_shadowPalette);
|
free(_shadowPalette);
|
||||||
@ -741,12 +741,12 @@ void Scumm::setFeatures (uint32 newFeatures) {
|
|||||||
|
|
||||||
_features = newFeatures;
|
_features = newFeatures;
|
||||||
|
|
||||||
if (!_bcr || newCostumes != newNewCostumes) {
|
if (!_costumeRenderer || newCostumes != newNewCostumes) {
|
||||||
delete _bcr;
|
delete _costumeRenderer;
|
||||||
if (newNewCostumes)
|
if (newNewCostumes)
|
||||||
_bcr = new AkosRenderer(this);
|
_costumeRenderer = new AkosRenderer(this);
|
||||||
else
|
else
|
||||||
_bcr = new CostumeRenderer(this);
|
_costumeRenderer = new CostumeRenderer(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user