[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.61,1.62 gfx.cpp,1.58,1.59 gfx.h,1.36,1.37
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 27 10:39:33 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.60,1.61
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.185,1.186 animation.cpp,1.62,1.63 font.cpp,1.35,1.36 font.h,1.17,1.18 sfuncs.cpp,1.161,1.162
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1814
Modified Files:
animation.cpp gfx.cpp gfx.h
Log Message:
Used Willem Jan's suggestion for making the ugliness go away.
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- animation.cpp 27 Sep 2005 17:00:32 -0000 1.61
+++ animation.cpp 27 Sep 2005 17:38:35 -0000 1.62
@@ -114,7 +114,7 @@
const Rect rect(width, height);
bgSurface->blit(rect, buf);
- _vm->_gfx->setPalette(const_cast<PalEntry *>(palette));
+ _vm->_gfx->setPalette(palette);
free(buf);
free(resourceData);
@@ -215,7 +215,6 @@
}
anim->start += temp;
-
// Cache frame offsets
anim->frameOffsets = (size_t *)malloc((anim->maxFrame + 1) * sizeof(*anim->frameOffsets));
if (anim->frameOffsets == NULL) {
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- gfx.cpp 13 Aug 2005 19:41:11 -0000 1.58
+++ gfx.cpp 27 Sep 2005 17:38:35 -0000 1.59
@@ -164,7 +164,7 @@
}
-void Gfx::setPalette(PalEntry *pal) {
+void Gfx::setPalette(const PalEntry *pal) {
int i;
byte *ppal;
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gfx.h 30 Jul 2005 21:11:21 -0000 1.36
+++ gfx.h 27 Sep 2005 17:38:35 -0000 1.37
@@ -134,7 +134,7 @@
return &_backBuffer;
}
- void setPalette(PalEntry *pal);
+ void setPalette(const PalEntry *pal);
void getCurrentPal(PalEntry *src_pal);
void palToBlack(PalEntry *src_pal, double percent);
void blackToPal(PalEntry *src_pal, double percent);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.60,1.61
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.185,1.186 animation.cpp,1.62,1.63 font.cpp,1.35,1.36 font.h,1.17,1.18 sfuncs.cpp,1.161,1.162
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list