libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

endian-convert pieces value when read, instead of when they are loaded (since I don't know how to tell how many picts there)

Browse Source 
svn-id: r17556
This commit is contained in:
Joost Peters 2005-04-11 22:44:37 +00:00
parent 510fcec93d
commit 40fb3732c0
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gob/scenery.cpp
View File

@ -141,11 +141,6 @@ int16 scen_loadStatic(char search) {
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 @@ void scen_renderStatic(int16 scenery, int16 layer) {
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 @@ void scen_updateStatic(int16 orderFrom) {
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 @@ int16 scen_loadAnim(char search) {
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 @@ void scen_updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
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) {