[Scummvm-cvs-logs] SF.net SVN: scummvm:[36058] scummvm/trunk/engines/tinsel
joostp at users.sourceforge.net
joostp at users.sourceforge.net
Sun Jan 25 12:02:34 CET 2009
Revision: 36058
http://scummvm.svn.sourceforge.net/scummvm/?rev=36058&view=rev
Author: joostp
Date: 2009-01-25 11:02:34 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
some DW2 endian fixes
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/bg.cpp
scummvm/trunk/engines/tinsel/cursor.cpp
scummvm/trunk/engines/tinsel/multiobj.cpp
scummvm/trunk/engines/tinsel/palette.cpp
scummvm/trunk/engines/tinsel/play.cpp
Modified: scummvm/trunk/engines/tinsel/bg.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/bg.cpp 2009-01-25 10:46:48 UTC (rev 36057)
+++ scummvm/trunk/engines/tinsel/bg.cpp 2009-01-25 11:02:34 UTC (rev 36058)
@@ -135,18 +135,18 @@
} else {
/*** At start of scene ***/
pFilm = (const FILM *)LockMem(hBackground);
- bgReels = pFilm->numreels;
+ bgReels = FROM_LE_32(pFilm->numreels);
int i;
for (i = 0; i < bgReels; i++) {
// Get the MULTI_INIT structure
- pmi = (PMULTI_INIT) LockMem(pFilm->reels[i].mobj);
+ pmi = (PMULTI_INIT) LockMem(FROM_LE_32(pFilm->reels[i].mobj));
// Initialise and insert the object, and initialise its script.
pBG[i] = MultiInitObject(pmi);
MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[i]);
MultiSetZPosition(pBG[i], 0);
- InitStepAnimScript(&thisAnim[i], pBG[i], pFilm->reels[i].script, BGspeed);
+ InitStepAnimScript(&thisAnim[i], pBG[i], FROM_LE_32(pFilm->reels[i].script), BGspeed);
if (i > 0)
pBG[i-1]->pSlave = pBG[i];
@@ -175,7 +175,7 @@
StepAnimScript(&thisAnim[0]);
} else {
pFilm = (const FILM *)LockMem(hBackground);
- assert(bgReels == pFilm->numreels);
+ assert(bgReels == FROM_LE_32(pFilm->numreels));
// Just re-initialise the scripts.
for (int i = 0; i < bgReels; i++) {
Modified: scummvm/trunk/engines/tinsel/cursor.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/cursor.cpp 2009-01-25 10:46:48 UTC (rev 36057)
+++ scummvm/trunk/engines/tinsel/cursor.cpp 2009-01-25 11:02:34 UTC (rev 36058)
@@ -482,7 +482,7 @@
if (TinselV2) {
pFilm = (const FILM *)LockMem(hCursorFilm);
pfr = (const FREEL *)&pFilm->reels[0];
- pmi = (MULTI_INIT *)LockMem(pfr->mobj);
+ pmi = (MULTI_INIT *)LockMem(FROM_LE_32(pfr->mobj));
PokeInPalette(pmi);
} else {
Modified: scummvm/trunk/engines/tinsel/multiobj.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/multiobj.cpp 2009-01-25 10:46:48 UTC (rev 36057)
+++ scummvm/trunk/engines/tinsel/multiobj.cpp 2009-01-25 11:02:34 UTC (rev 36058)
@@ -46,7 +46,7 @@
OBJECT *pFirst, *pObj; // object pointers
FRAME *pFrame; // list of images for the multi-part object
- if (pInitTbl->hMulFrame) {
+ if (FROM_LE_32(pInitTbl->hMulFrame)) {
// we have a frame handle
pFrame = (FRAME *)LockMem(FROM_LE_32(pInitTbl->hMulFrame));
Modified: scummvm/trunk/engines/tinsel/palette.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/palette.cpp 2009-01-25 10:46:48 UTC (rev 36057)
+++ scummvm/trunk/engines/tinsel/palette.cpp 2009-01-25 11:02:34 UTC (rev 36058)
@@ -257,7 +257,7 @@
if (TinselV2)
// Copy all the colours
- memcpy(p->palRGB, pNewPal->palRGB, pNewPal->numColours * sizeof(COLORREF));
+ memcpy(p->palRGB, pNewPal->palRGB, FROM_LE_32(pNewPal->numColours) * sizeof(COLORREF));
#ifdef DEBUG
// one more palette in use
@@ -267,7 +267,7 @@
// Q the change to the video DAC
if (TinselV2)
- UpdateDACqueue(p->posInDAC, pNewPal->numColours, p->palRGB);
+ UpdateDACqueue(p->posInDAC, FROM_LE_32(pNewPal->numColours), p->palRGB);
else
UpdateDACqueueHandle(p->posInDAC, p->numColours, p->hPal);
Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp 2009-01-25 10:46:48 UTC (rev 36057)
+++ scummvm/trunk/engines/tinsel/play.cpp 2009-01-25 11:02:34 UTC (rev 36058)
@@ -97,12 +97,12 @@
// Could be an empty column
if (pmi->hMulFrame) {
- pFrame = (FRAME *)LockMem(pmi->hMulFrame);
+ pFrame = (FRAME *)LockMem(FROM_LE_32(pmi->hMulFrame));
// get pointer to image
- pim = (IMAGE *)LockMem(*pFrame); // handle to image
+ pim = (IMAGE *)LockMem(READ_LE_UINT32(pFrame)); // handle to image
- pim->hImgPal = BgPal();
+ pim->hImgPal = TO_LE_32(BgPal());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list