[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.361,1.362 script_v100he.cpp,2.157,2.158 script_v90he.cpp,2.262,2.263 scumm.cpp,1.534,1.535 sprite_he.cpp,1.143,1.144 sprite_he.h,1.39,1.40

kirben kirben at users.sourceforge.net
Mon May 23 04:55:55 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23633/scumm

Modified Files:
	actor.cpp script_v100he.cpp script_v90he.cpp scumm.cpp 
	sprite_he.cpp sprite_he.h 
Log Message:

Rename sprite functions.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- actor.cpp	23 May 2005 09:30:41 -0000	1.361
+++ actor.cpp	23 May 2005 11:50:35 -0000	1.362
@@ -1022,8 +1022,8 @@
 void ScummEngine_v90he::processActors() {
 	preProcessAuxQueue();
 
-	_sprite->spritesMarkDirty(false);
-	_sprite->spritesProcessWiz(true);
+	_sprite->setRedrawFlags(false);
+	_sprite->processImages(true);
 
 	if (!_skipProcessActors)
 		ScummEngine::processActors();
@@ -1032,8 +1032,8 @@
 
 	postProcessAuxQueue();
 
-	_sprite->spritesMarkDirty(true);
-	_sprite->spritesProcessWiz(false);
+	_sprite->setRedrawFlags(true);
+	_sprite->processImages(false);
 }
 #endif
 

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -d -r2.157 -r2.158
--- script_v100he.cpp	23 May 2005 09:30:42 -0000	2.157
+++ script_v100he.cpp	23 May 2005 11:50:35 -0000	2.158
@@ -981,7 +981,7 @@
 		if (!_curSpriteGroupId)
 			break;
 
-		_sprite->spritesResetGroup(_curSpriteGroupId);
+		_sprite->resetGroup(_curSpriteGroupId);
 		break;
 	case 54:
 		// dummy case
@@ -1816,7 +1816,7 @@
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->spriteAddImageToList(spriteId, 1, &args[0]);
+			_sprite->addImageToList(spriteId, 1, &args[0]);
 		break;
 	case 48:
 		args[0] = pop();
@@ -1919,7 +1919,7 @@
 			}
 		break;
 	case 61:
-		_sprite->spritesResetTables(true);
+		_sprite->resetTables(true);
 		break;
 	case 65:
 		args[0] = pop();

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.262
retrieving revision 2.263
diff -u -d -r2.262 -r2.263
--- script_v90he.cpp	23 May 2005 09:30:42 -0000	2.262
+++ script_v90he.cpp	23 May 2005 11:50:35 -0000	2.263
@@ -1242,7 +1242,7 @@
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			_sprite->spriteAddImageToList(spriteId, 1, &args[0]);
+			_sprite->addImageToList(spriteId, 1, &args[0]);
 		break;
 	case 31:
 		args[1] = pop();
@@ -1392,7 +1392,7 @@
 			_sprite->setSpriteField80(spriteId, args[0]);
 		break;
 	case 124:
-		_sprite->spritesResetTables(true);
+		_sprite->resetTables(true);
 		break;
 	case 164:
 		args[1] = pop();
@@ -1650,7 +1650,7 @@
 		if (!_curSpriteGroupId)
 			break;
 
-		_sprite->spritesResetGroup(_curSpriteGroupId);
+		_sprite->resetGroup(_curSpriteGroupId);
 		break;
 	default:
 		error("o90_setSpriteGroupInfo: Unknown case %d", subOp);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -d -r1.534 -r1.535
--- scumm.cpp	23 May 2005 09:30:42 -0000	1.534
+++ scumm.cpp	23 May 2005 11:50:35 -0000	1.535
@@ -1836,7 +1836,7 @@
 	_heObjectNum = 0;
 	_hePaletteNum = 0;
 
-	_sprite->spritesResetTables(0);
+	_sprite->resetTables(0);
 	memset(&_wizParams, 0, sizeof(_wizParams));
 
 	if (_features & GF_HE_CURSORLESS)
@@ -2268,8 +2268,8 @@
 
 #ifndef DISABLE_HE
 		if (_heversion >= 90) {
-			((ScummEngine_v90he *)this)->_sprite->spritesBlitToScreen();
-			((ScummEngine_v90he *)this)->_sprite->spritesSortActiveSprites();
+			((ScummEngine_v90he *)this)->_sprite->resetBackground();
+			((ScummEngine_v90he *)this)->_sprite->sortActiveSprites();
 		}
 #endif
 	
@@ -2329,7 +2329,7 @@
 
 #ifndef DISABLE_HE
 	if (_heversion >= 90) {
-		((ScummEngine_v90he *)this)->_sprite->spritesUpdateImages();
+		((ScummEngine_v90he *)this)->_sprite->updateImages();
 	}
 	if (_heversion >= 98) {
 		((ScummEngine_v90he *)this)->_logicHE->endOfFrame();

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- sprite_he.cpp	23 May 2005 09:30:43 -0000	1.143
+++ sprite_he.cpp	23 May 2005 11:50:35 -0000	1.144
@@ -38,7 +38,7 @@
 
 void ScummEngine_v90he::allocateArrays() {
 	ScummEngine::allocateArrays();
-	_sprite->spritesAllocTables(_numSprites, MAX(64, _numSprites / 4), 64);
+	_sprite->allocTables(_numSprites, MAX(64, _numSprites / 4), 64);
 }
 
 void Sprite::getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound) {
@@ -778,7 +778,7 @@
 	_spriteTable[spriteId].zoom = 0;
 
 	int tmp = 0;
-	spriteAddImageToList(spriteId, 1, &tmp);
+	addImageToList(spriteId, 1, &tmp);
 
 	_spriteTable[spriteId].xmapNum = 0;
 	_spriteTable[spriteId].tx = 0;
@@ -802,7 +802,7 @@
 	_spriteTable[spriteId].field_90 = 0;
 }
 
-void Sprite::spriteAddImageToList(int spriteId, int imageNum, int *spriteIdptr) {
+void Sprite::addImageToList(int spriteId, int imageNum, int *spriteIdptr) {
 	int origResId, origResWizStates;
 
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
@@ -1042,7 +1042,7 @@
 	redrawSpriteGroup(spriteGroupId);
 }
 
-void Sprite::spritesAllocTables(int numSprites, int numGroups, int numMaxSprites) {
+void Sprite::allocTables(int numSprites, int numGroups, int numMaxSprites) {
 	_varNumSpriteGroups = numGroups;
 	_numSpritesToProcess = 0;
 	_varNumSprites = numSprites;
@@ -1052,7 +1052,7 @@
 	_activeSpritesTable = (SpriteInfo **)malloc((_varNumSprites + 1) * sizeof(SpriteInfo *));
 }
 
-void Sprite::spritesResetGroup(int spriteGroupId) {
+void Sprite::resetGroup(int spriteGroupId) {
 	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 	SpriteGroup *spg = &_spriteGroups[spriteGroupId];
 
@@ -1070,11 +1070,11 @@
 	spg->scale_y_ratio_div = 1;
 }
 
-void Sprite::spritesResetTables(bool refreshScreen) {
+void Sprite::resetTables(bool refreshScreen) {
 	memset(_spriteTable, 0, (_varNumSprites + 1) * sizeof(SpriteInfo));
 	memset(_spriteGroups, 0, (_varNumSpriteGroups + 1) * sizeof(SpriteGroup));
 	for (int curGrp = 1; curGrp < _varNumSpriteGroups; ++curGrp)
-		spritesResetGroup(curGrp);
+		resetGroup(curGrp);
 
 	if (refreshScreen) {
 		_vm->gdi.copyVirtScreenBuffers(Common::Rect(_vm->_screenWidth, _vm->_screenHeight));
@@ -1082,7 +1082,7 @@
 	_numSpritesToProcess = 0;
 }
 
-void Sprite::spritesBlitToScreen() {
+void Sprite::resetBackground() {
 	int xmin, xmax, ymin, ymax;
 	xmin = ymin = 1234;
 	xmax = ymax = -1234; 
@@ -1128,7 +1128,7 @@
 	}
 }
 
-void Sprite::spritesMarkDirty(bool checkZOrder) {
+void Sprite::setRedrawFlags(bool checkZOrder) {
 	VirtScreen *vs = &_vm->virtscr[kMainVirtScreen];
 	for (int i = 0; i < _numSpritesToProcess; ++i) {
 		SpriteInfo *spi = _activeSpritesTable[i];
@@ -1157,7 +1157,7 @@
 	}
 }
 
-void Sprite::spritesUpdateImages() {
+void Sprite::updateImages() {
 	for (int i = 0; i < _numSpritesToProcess; ++i) {
 		SpriteInfo *spi = _activeSpritesTable[i];
 		if (spi->dx || spi->dy) {
@@ -1202,7 +1202,7 @@
 	return 0;
 }
 
-void Sprite::spritesSortActiveSprites() {
+void Sprite::sortActiveSprites() {
 	int groupZorder;
 
 	_numSpritesToProcess = 0;
@@ -1238,7 +1238,7 @@
 	qsort(_activeSpritesTable, _numSpritesToProcess, sizeof(SpriteInfo *), compareSprTable);
 }
 
-void Sprite::spritesProcessWiz(bool arg) {
+void Sprite::processImages(bool arg) {
 	int spr_flags;
 	int16 spr_wiz_x, spr_wiz_y;
 	int resId, resState;

Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sprite_he.h	23 May 2005 09:30:43 -0000	1.39
+++ sprite_he.h	23 May 2005 11:50:36 -0000	1.40
@@ -113,11 +113,11 @@
 	int32 _varMaxSprites;
 
 	void saveOrLoadSpriteData(Serializer *s, uint32 savegameVersion);
-	void spritesBlitToScreen();
-	void spritesMarkDirty(bool checkZOrder);
-	void spritesSortActiveSprites();
-	void spritesProcessWiz(bool arg);
-	void spritesUpdateImages();
+	void resetBackground();
+	void setRedrawFlags(bool checkZOrder);
+	void sortActiveSprites();
+	void processImages(bool arg);
+	void updateImages();
 
 	void getSpriteBounds(int spriteId, bool checkGroup, Common::Rect &bound);
 	int findSpriteWithClassOf(int x, int y, int spriteGroupId, int d, int num, int *args);
@@ -206,10 +206,10 @@
 	void setGroupScale_y_ratio_div(int spriteGroupId, int value);
 	void setGroupflagClipBoxAnd(int spriteGroupId);
 
-	void spritesAllocTables(int numSprites, int numGroups, int numMaxSprites);
-	void spritesResetGroup(int spriteGroupId);
-	void spritesResetTables(bool refreshScreen);
-	void spriteAddImageToList(int spriteId, int imageNum, int *spriteIdptr);
+	void allocTables(int numSprites, int numGroups, int numMaxSprites);
+	void resetGroup(int spriteGroupId);
+	void resetTables(bool refreshScreen);
+	void addImageToList(int spriteId, int imageNum, int *spriteIdptr);
 private:
 	ScummEngine_v90he *_vm;
 };





More information about the Scummvm-git-logs mailing list