[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.52,1.53
kirben
kirben at users.sourceforge.net
Thu Feb 24 17:25:43 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27287/scumm
Modified Files:
sprite_he.cpp
Log Message:
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- sprite_he.cpp 25 Feb 2005 01:15:16 -0000 1.52
+++ sprite_he.cpp 25 Feb 2005 01:20:46 -0000 1.53
@@ -1144,7 +1144,7 @@
}
void ScummEngine_v90he::spritesProcessWiz(bool arg) {
- int spr_flags, spr_flags_;
+ int spr_flags;
int16 spr_wiz_x, spr_wiz_y;
int res_id, res_state;
Common::Rect *bboxPtr;
@@ -1202,9 +1202,8 @@
if (res_id) {
rot_angle = spi->rot_angle;
zoom = spi->zoom;
- spr_flags_ = spi->flags & kSFRotated;
getWizImageDim(res_id, res_state, w, h);
- if (!(spi->flags & (kSFZoomed | kSFRotated)) || 1) { // FIXME. remove '|| 1'
+ if (!(spi->flags & kSFZoomed) && !(spi->flags & kSFRotated)) {
bboxPtr->left = wiz.img.x1;
bboxPtr->top = wiz.img.y1;
bboxPtr->right = wiz.img.x1 + w;
@@ -1223,7 +1222,7 @@
pts[j].y = pts[i].y * zoom / 256;
}
}
- if (rot_angle) {
+ if (spi->flags & kSFRotated) {
double alpha = rot_angle * PI / 180.;
double cos_alpha = cos(alpha);
double sin_alpha = sin(alpha);
More information about the Scummvm-git-logs
mailing list