[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.127,1.128 scumm.h,1.254,1.255 scummvm.cpp,2.239,2.240

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv32484

Modified Files:
	actor.cpp scumm.h scummvm.cpp 
Log Message:
renamed _bcr -> _costumeRenderer

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- actor.cpp	7 Jun 2003 00:49:35 -0000	1.127
+++ actor.cpp	14 Jun 2003 13:38:21 -0000	1.128
@@ -884,7 +884,7 @@
 
 	setupActorScale();
 
-	BaseCostumeRenderer* bcr = _vm->_bcr;
+	BaseCostumeRenderer* bcr = _vm->_costumeRenderer;
 
 	bcr->updateNbStrips ();
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- scumm.h	14 Jun 2003 12:23:30 -0000	1.254
+++ scumm.h	14 Jun 2003 13:38:22 -0000	1.255
@@ -421,7 +421,7 @@
 public:
 	int _numCostumes;	// FIXME - should be protected, used by Actor::remapActorPalette
 
-	BaseCostumeRenderer* _bcr;
+	BaseCostumeRenderer* _costumeRenderer;
 	
 	char *_audioNames;
 	int32 _numAudioNames;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.239
retrieving revision 2.240
diff -u -d -r2.239 -r2.240
--- scummvm.cpp	14 Jun 2003 13:26:11 -0000	2.239
+++ scummvm.cpp	14 Jun 2003 13:38:22 -0000	2.240
@@ -410,7 +410,7 @@
 	_languageBuffer = NULL;
 	_languageIndex = NULL;
 	memset(_transText, 0, sizeof(_transText));
-	_bcr = NULL;
+	_costumeRenderer = NULL;
 	_2byteFontPtr = 0;
 
 	//
@@ -725,7 +725,7 @@
 	delete _languageBuffer;
 	delete _audioNames;
 
-	delete _bcr;
+	delete _costumeRenderer;
 
 	if (_shadowPalette)
 		free(_shadowPalette);
@@ -741,12 +741,12 @@
 
 	_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);
 	}
 }