aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorFilippos Karapetis2013-05-01 03:50:29 +0300
committerFilippos Karapetis2013-05-01 03:50:29 +0300
commit5692c378ec5338b0bc977acd27945114f6f57537 (patch)
tree5e98703238ac0df9bdab1b9dd84c59f2c7211ae3 /engines/tinsel
parent0d53b7f6286ec96297dd2d2e21526be948f81c6c (diff)
downloadscummvm-rg350-5692c378ec5338b0bc977acd27945114f6f57537.tar.gz
scummvm-rg350-5692c378ec5338b0bc977acd27945114f6f57537.tar.bz2
scummvm-rg350-5692c378ec5338b0bc977acd27945114f6f57537.zip
TINSEL: Simplify palette endianess conversions
Diffstat (limited to 'engines/tinsel')
-rw-r--r--engines/tinsel/faders.cpp2
-rw-r--r--engines/tinsel/object.cpp4
-rw-r--r--engines/tinsel/palette.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/tinsel/faders.cpp b/engines/tinsel/faders.cpp
index b772e37b47..b51b1d6d4f 100644
--- a/engines/tinsel/faders.cpp
+++ b/engines/tinsel/faders.cpp
@@ -106,7 +106,7 @@ static void FadeProcess(CORO_PARAM, const void *param) {
FadingPalette(pFade->pPalQ, true);
// get pointer to palette - reduce pointer indirection a bit
- _ctx->pPalette = (PALETTE *)LockMem(FROM_32(pFade->pPalQ->hPal));
+ _ctx->pPalette = (PALETTE *)LockMem(pFade->pPalQ->hPal);
for (_ctx->pColMult = pFade->pColorMultTable; *_ctx->pColMult >= 0; _ctx->pColMult++) {
// go through all multipliers in table - until a negative entry
diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp
index cbf1c86649..b70b581bbe 100644
--- a/engines/tinsel/object.cpp
+++ b/engines/tinsel/object.cpp
@@ -375,7 +375,7 @@ OBJECT *InitObject(const OBJ_INIT *pInitTbl) {
if (pImg->hImgPal) {
// allocate a palette for this object
- pPalQ = AllocPalette(FROM_LE_32(pImg->hImgPal));
+ pPalQ = AllocPalette(FROM_32(pImg->hImgPal));
// make sure palette allocated
assert(pPalQ != NULL);
@@ -494,7 +494,7 @@ OBJECT *RectangleObject(SCNHANDLE hPal, int color, int width, int height) {
OBJECT *pRect = InitObject(&rectObj);
// allocate a palette for this object
- pPalQ = AllocPalette(FROM_32(hPal));
+ pPalQ = AllocPalette(hPal);
// make sure palette allocated
assert(pPalQ != NULL);
diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp
index 505cb21adb..b72d52cc8d 100644
--- a/engines/tinsel/palette.cpp
+++ b/engines/tinsel/palette.cpp
@@ -150,7 +150,7 @@ void PalettesToVideoDAC() {
// we are using a palette handle
// get hardware palette pointer
- pPalette = (const PALETTE *)LockMem(FROM_32(pDACtail->pal.hRGBarray));
+ pPalette = (const PALETTE *)LockMem(pDACtail->pal.hRGBarray);
// get RGB pointer
pColors = pPalette->palRGB;
@@ -306,7 +306,7 @@ PALQ *AllocPalette(SCNHANDLE hNewPal) {
PALETTE *pNewPal;
// get pointer to new palette
- pNewPal = (PALETTE *)LockMem(FROM_32(hNewPal));
+ pNewPal = (PALETTE *)LockMem(hNewPal);
// search all structs in palette allocator - see if palette already allocated
for (p = g_palAllocData; p < g_palAllocData + NUM_PALETTES; p++) {