[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.60,1.61

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Sep 27 10:01:27 CEST 2005


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

Modified Files:
	animation.cpp 
Log Message:
This seems a bit awkward, but does keep GCC from warning about discarding
constness.


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- animation.cpp	27 Sep 2005 06:16:16 -0000	1.60
+++ animation.cpp	27 Sep 2005 17:00:32 -0000	1.61
@@ -108,13 +108,13 @@
 
 	_vm->decodeBGImage(resourceData, resourceDataLength, &buf, &buflen, &width, &height);
 
-	PalEntry *palette = (PalEntry *)_vm->getImagePal(resourceData, resourceDataLength);
+	const PalEntry *palette = (const PalEntry *)_vm->getImagePal(resourceData, resourceDataLength);
 
 	Surface *bgSurface = _vm->_render->getBackGroundSurface();
 	const Rect rect(width, height);
 
 	bgSurface->blit(rect, buf);
-	_vm->_gfx->setPalette(palette);
+	_vm->_gfx->setPalette(const_cast<PalEntry *>(palette));
 
 	free(buf);
 	free(resourceData);





More information about the Scummvm-git-logs mailing list