[Scummvm-cvs-logs] CVS: scummvm/gob scenery.cpp,1.11,1.12
Joost Peters
joostp at users.sourceforge.net
Mon Apr 11 15:45:14 CEST 2005
Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16527/gob
Modified Files:
scenery.cpp
Log Message:
endian-convert pieces value when read, instead of when they are loaded (since I don't know how to tell how many picts there)
Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- scenery.cpp 11 Apr 2005 11:25:45 -0000 1.11
+++ scenery.cpp 11 Apr 2005 22:44:37 -0000 1.12
@@ -141,11 +141,6 @@
game_loadTotResource(pictDescId);
}
- ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
- ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
- ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
- ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
-
width = inter_load16();
height = inter_load16();
sprResId = inter_load16();
@@ -256,10 +251,10 @@
draw_destSpriteX = planePtr->destX;
draw_destSpriteY = planePtr->destY;
- left = ptr->pieces[pictIndex][pieceIndex].left;
- right = ptr->pieces[pictIndex][pieceIndex].right;
- top = ptr->pieces[pictIndex][pieceIndex].top;
- bottom = ptr->pieces[pictIndex][pieceIndex].bottom;
+ left = FROM_LE_16(ptr->pieces[pictIndex][pieceIndex].left);
+ right = FROM_LE_16(ptr->pieces[pictIndex][pieceIndex].right);
+ top = FROM_LE_16(ptr->pieces[pictIndex][pieceIndex].top);
+ bottom = FROM_LE_16(ptr->pieces[pictIndex][pieceIndex].bottom);
draw_sourceSurface =
scen_staticPictToSprite[scenery * 7 + pictIndex];
@@ -325,10 +320,10 @@
draw_destSpriteX = planePtr->destX;
draw_destSpriteY = planePtr->destY;
- left = pictPtr[pictIndex][pieceIndex].left;
- right = pictPtr[pictIndex][pieceIndex].right;
- top = pictPtr[pictIndex][pieceIndex].top;
- bottom = pictPtr[pictIndex][pieceIndex].bottom;
+ left = FROM_LE_16(pictPtr[pictIndex][pieceIndex].left);
+ right = FROM_LE_16(pictPtr[pictIndex][pieceIndex].right);
+ top = FROM_LE_16(pictPtr[pictIndex][pieceIndex].top);
+ bottom = FROM_LE_16(pictPtr[pictIndex][pieceIndex].bottom);
if (draw_destSpriteX > scen_toRedrawRight)
continue;
@@ -453,12 +448,6 @@
game_loadTotResource(pictDescId);
}
-
- ptr->pieces[i]->left = (int16)READ_LE_UINT16(&ptr->pieces[i]->left);
- ptr->pieces[i]->right = (int16)READ_LE_UINT16(&ptr->pieces[i]->right);
- ptr->pieces[i]->top = (int16)READ_LE_UINT16(&ptr->pieces[i]->top);
- ptr->pieces[i]->bottom = (int16)READ_LE_UINT16(&ptr->pieces[i]->bottom);
-
width = inter_load16();
height = inter_load16();
sprResId = inter_load16();
@@ -602,10 +591,10 @@
pictIndex = (pictIndex & 15) - 1;
- left = pictPtr[pictIndex][pieceIndex].left;
- right = pictPtr[pictIndex][pieceIndex].right;
- top = pictPtr[pictIndex][pieceIndex].top;
- bottom = pictPtr[pictIndex][pieceIndex].bottom;
+ left = FROM_LE_16(pictPtr[pictIndex][pieceIndex].left);
+ right = FROM_LE_16(pictPtr[pictIndex][pieceIndex].right);
+ top = FROM_LE_16(pictPtr[pictIndex][pieceIndex].top);
+ bottom = FROM_LE_16(pictPtr[pictIndex][pieceIndex].bottom);
if (flags & 2) {
if (destX < anim_animAreaLeft) {
More information about the Scummvm-git-logs
mailing list