- added defines to handle the different mouse cursors

- revised the way NUM_MAX_PARTDATA and NUM_MAX_ANIMDATA are used
- renamed some variables
- constify'ed function arguments
- minor cleanup

svn-id: r21338

16 files changed, 123 insertions, 151 deletions

diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index eb5cee2ddc..d87eb1bee9 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -179,33 +179,29 @@ animDataEntry animData[] = {
 	{"FIN", 0x9},
 };
 
-#define NUM_ANIM_DATA (sizeof(animData)/sizeof(animDataEntry))
-
-uint8 findAnimInHardcodedData(char *animName) {
+uint8 getAnimTransparentColor(const char *animName) {
 	char name[15];
-	uint16 i;
 
 	removeExtention(name, animName);
 
-	for (i = 0; i < NUM_ANIM_DATA; i++) {
+	for (int i = 0; i < ARRAYSIZE(animData); i++) {
 		if (!strcmp(name, animData[i].name)) {
-			return (animData[i].param);
+			return animData[i].color;
 		}
 	}
-
-	return (0);
+	return 0;
 }
 
 int16 allocFrame(uint16 width, uint16 height, int8 isMask) {
 	uint16 i;
 	uint32 frameSize;
 
-	for (i = 0; i < NUM_MAX_PARTDATA; i++) {
+	for (i = 0; i < NUM_MAX_ANIMDATA; i++) {
 		if (!animDataTable[i].ptr1)
 			break;
 	}
 
-	if (i == NUM_MAX_PARTDATA)
+	if (i == NUM_MAX_ANIMDATA)
 		return -1;
 
 	if (!isMask) {		// sprite + generated mask
@@ -246,12 +242,12 @@ int16 allocFrame2(uint16 width, uint16 height, uint16 type) {
 	uint16 i;
 	uint32 frameSize;
 
-	for (i = 0; i < NUM_MAX_PARTDATA; i++) {
+	for (i = 0; i < NUM_MAX_ANIMDATA; i++) {
 		if (!animDataTable[i].ptr1)
 			break;
 	}
 
-	if (i == NUM_MAX_PARTDATA)
+	if (i == NUM_MAX_ANIMDATA)
 		return -1;
 
 	frameSize = width * height;
@@ -376,7 +372,7 @@ void convert4BBP(uint8 * dest, uint8 * source, int16 width, int16 height) {
 	}
 }
 
-void loadSpl(char *resourceName) {
+void loadSpl(const char *resourceName) {
 	int16 foundFileIdx;
 	uint8 *dataPtr;
 	int16 entry;
@@ -395,7 +391,7 @@ void loadSpl(char *resourceName) {
 	strcpy(animDataTable[entry].name, currentPartName);
 }
 
-void loadMsk(char *resourceName) {
+void loadMsk(const char *resourceName) {
 	int16 foundFileIdx;
 	uint8 *dataPtr;
 	int16 entry;
@@ -428,7 +424,7 @@ void loadMsk(char *resourceName) {
 	}
 }
 
-void loadAni(char *resourceName) {
+void loadAni(const char *resourceName) {
 	int16 foundFileIdx;
 	uint8 *dataPtr;
 	int16 entry;
@@ -449,7 +445,7 @@ void loadAni(char *resourceName) {
 	animHeader.frameHeight = TO_BE_16(animHeader.frameHeight);
 	animHeader.numFrames = TO_BE_16(animHeader.numFrames);
 
-	transparentColor = findAnimInHardcodedData(resourceName);
+	transparentColor = getAnimTransparentColor(resourceName);
 
 	fullSize = animHeader.frameWidth * animHeader.frameHeight;
 
@@ -606,7 +602,7 @@ void convert8BBP2(uint8 * dest, uint8 * source, int16 width, int16 height) {
 	}
 }
 
-void loadSet(char *resourceName) {
+void loadSet(const char *resourceName) {
 	animHeader2Struct header2;
 	int16 foundFileIdx;
 	uint8 *dataPtr;
@@ -689,7 +685,7 @@ void loadSet(char *resourceName) {
 	}
 }
 
-void loadSetAbs(char *resourceName, uint16 idx) {
+void loadSetAbs(const char *resourceName, uint16 idx) {
 	animHeader2Struct header2;
 	int16 foundFileIdx;
 	uint8 *dataPtr;
@@ -772,7 +768,7 @@ void loadSetAbs(char *resourceName, uint16 idx) {
 	}
 }
 
-void loadSeq(char *resourceName) {
+void loadSeq(const char *resourceName) {
 	int16 foundFileIdx;
 	uint8 *dataPtr;
 	int16 entry;
@@ -785,7 +781,7 @@ void loadSeq(char *resourceName) {
 	memcpy(animDataTable[entry].ptr1, dataPtr + 0x16, (uint16) partBuffer[foundFileIdx].unpackedSize - 0x16);
 }
 
-void loadSeqAbs(char *resourceName, uint16 idx) {
+void loadSeqAbs(const char *resourceName, uint16 idx) {
 	int16 foundFileIdx;
 	uint8 *dataPtr;
 	int16 entry;
@@ -798,7 +794,7 @@ void loadSeqAbs(char *resourceName, uint16 idx) {
 	memcpy(animDataTable[entry].ptr1, dataPtr + 0x16, (uint16) partBuffer[foundFileIdx].unpackedSize - 0x16);
 }
 
-void loadResource(char *resourceName) {
+void loadResource(const char *resourceName) {
 	/* uint8 isMask = 0; */
 	/* uint8 isSpl = 0; */
 
@@ -825,7 +821,7 @@ void loadResource(char *resourceName) {
 	ASSERT(0);
 }
 
-void loadAbs(char *resourceName, uint16 idx) {
+void loadAbs(const char *resourceName, uint16 idx) {
 	/* uint8 isMask = 0; */
 	/* uint8 isSpl = 0; */
 
@@ -910,7 +906,7 @@ void loadResourcesFromSave() {
 
 				loadRelatedPalette(animName);
 
-				transparentColor = findAnimInHardcodedData(animName);
+				transparentColor = getAnimTransparentColor(animName);
 
 				for (i = 0; i < animHeader.numFrames; i++) { // load all the frames
 					int16 entry;
diff --git a/engines/cine/anim.h b/engines/cine/anim.h
index 91cd560ee6..a76941cf32 100644
--- a/engines/cine/anim.h
+++ b/engines/cine/anim.h
@@ -52,13 +52,13 @@ struct animHeaderStruct {
 
 struct animDataEntry {
 	char name[9];
-	uint8 param;
+	uint8 color;
 };
 
 extern animDataEntry animData[];
 
-void loadResource(char *animName);
-void loadAbs(char *resourceName, uint16 idx);
+void loadResource(const char *animName);
+void loadAbs(const char *resourceName, uint16 idx);
 void loadResourcesFromSave();
 
 } // End of namespace Cine
diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp
index 4fc76d264c..9e53c2f33c 100644
--- a/engines/cine/bg.cpp
+++ b/engines/cine/bg.cpp
@@ -30,53 +30,44 @@ namespace Cine {
 uint16 bgVar0;
 
 void loadCtHigh(uint8 * currentPtr) {
-	currentPtr += 256 * 3;
-
 	memcpy(page3Raw, currentPtr, 320 * 200);
 }
 
 uint8 loadCt(const char *ctName) {
-	uint8 *ptr;
-	uint8 *currentPtr;
-	uint8 i;
 	uint16 header[32];
 
-	///
-
 	strcpy(currentCtName, ctName);
 
-	currentPtr = ptr = readBundleFile(findFileInBundle(ctName));
+	uint8 *ptr = readBundleFile(findFileInBundle(ctName));
 
 	if (gameType == Cine::GID_OS) {
-		if (READ_BE_UINT16(currentPtr) == 8) { // detect 256 color background
-			loadCtHigh(currentPtr + 2);
-			return 0;
+		uint16 bpp = READ_BE_UINT16(ptr); ptr += 2;
+		if (bpp == 8) {
+			ptr += 3 * 256;
+			loadCtHigh(ptr);
+		} else {
+			ptr += 32;
+			gfxResetRawPage(page3Raw);
+			gfxConvertSpriteToRaw(page3Raw, ptr, 160, 200);
 		}
-
-		currentPtr += 2;
-
-		currentPtr += 0x20;
-		gfxResetRawPage(page3Raw);
-		gfxConvertSpriteToRaw(page3Raw, ptr + 0x22, 160, 200);
 	} else {
 		loadRelatedPalette(ctName);
 
 		ASSERT(strstr(ctName, ".NEO"));
 
-		memcpy(header, currentPtr, 32);
-		currentPtr += 32;
+		memcpy(header, ptr, 32); ptr += 32;
 
-		for (i = 0; i < 16; i++) {
+		for (int i = 0; i < 16; i++) {
 			header[i] = TO_BE_16(header[i]);
 		}
 
-		gfxConvertSpriteToRaw(page3Raw, ptr + 0x80, 160, 200);
+		gfxConvertSpriteToRaw(page3Raw, ptr + 0x80 - 0x22, 160, 200);
 	}
 
 	return 0;
 }
 
-void loadBgHigh(char *currentPtr) {
+void loadBgHigh(const char *currentPtr) {
 	memcpy(palette256, currentPtr, 256 * 3);
 	currentPtr += 256 * 3;
 
@@ -86,39 +77,28 @@ void loadBgHigh(char *currentPtr) {
 }
 
 uint8 loadBg(const char *bgName) {
-	uint8 *ptr;
-	uint8 *currentPtr;
-	uint8 i;
-	uint8 fileIdx;
-
 	strcpy(currentBgName[0], bgName);
 
-	fileIdx = findFileInBundle(bgName);
-
-	currentPtr = ptr = readBundleFile(fileIdx);
+	uint8 fileIdx = findFileInBundle(bgName);
+	uint8 *ptr = readBundleFile(fileIdx);
 
-	if (READ_BE_UINT16(currentPtr) == 8) { // detect 256 color background
-		loadBgHigh((char *)currentPtr + 2);
-		return 0;
-	}
+	uint16 bpp = READ_BE_UINT16(ptr); ptr += 2;
+	if (bpp == 8) {
+		loadBgHigh((const char *)ptr);
+	} else {
+		colorMode256 = 0;
 
-	colorMode256 = 0;
+		memcpy(tempPalette, ptr, 32); ptr += 32;
 
-	memcpy(&dummyU16, currentPtr, 2);
-	currentPtr += 2;
+		for (int i = 0; i < 16; i++) {
+			tempPalette[i] = TO_BE_16(tempPalette[i]);
+		}
 
-	memcpy(tempPalette, currentPtr, 32);
-	currentPtr += 32;
+		loadRelatedPalette(bgName);
 
-	for (i = 0; i < 16; i++) {
-		tempPalette[i] = TO_BE_16(tempPalette[i]);
+		gfxResetRawPage(page2Raw);
+		gfxConvertSpriteToRaw(page2Raw, ptr, 160, 200);
 	}
-
-	loadRelatedPalette(bgName);
-
-	gfxResetRawPage(page2Raw);
-	gfxConvertSpriteToRaw(page2Raw, ptr + 0x22, 160, 200);
-
 	return 0;
 }
 
@@ -126,29 +106,22 @@ uint8 *additionalBgTable[9] = { page2Raw, NULL, NULL, NULL, NULL, NULL, NULL, NU
 uint8 currentAdditionalBgIdx = 0;
 uint8 currentAdditionalBgIdx2 = 0;
 
-void addBackground(char *bgName, uint16 bgIdx) {
-	uint8 *ptr;
-	uint8 *currentPtr;
-	uint8 fileIdx;
-
+void addBackground(const char *bgName, uint16 bgIdx) {
 	strcpy(currentBgName[bgIdx], bgName);
 
-	fileIdx = findFileInBundle(bgName);
-
-	currentPtr = ptr = readBundleFile(fileIdx);
+	uint8 fileIdx = findFileInBundle(bgName);
+	uint8 *ptr = readBundleFile(fileIdx);
 
 	additionalBgTable[bgIdx] = (uint8 *) malloc(320 * 200);
 
-	if (READ_BE_UINT16(currentPtr) == 8) { // detect 256 color background
-		memcpy(additionalBgTable[bgIdx], currentPtr + 2 + 3 * 256, 320 * 200);
-		return;
+	uint16 bpp = READ_BE_UINT16(ptr); ptr += 2;
+	if (bpp == 8) {
+		ptr += 3 * 256;
+		memcpy(additionalBgTable[bgIdx], ptr, 320 * 200);
+	} else {
+		ptr += 32;
+		gfxConvertSpriteToRaw(additionalBgTable[bgIdx], ptr, 160, 200);
 	}
-
-	currentPtr += 2;
-
-	currentPtr += 0x20;
-
-	gfxConvertSpriteToRaw(additionalBgTable[bgIdx], ptr + 0x22, 160, 200);
 }
 
 } // End of namespace Cine
diff --git a/engines/cine/bg.h b/engines/cine/bg.h
index 2a361cd293..d1cd6b5790 100644
--- a/engines/cine/bg.h
+++ b/engines/cine/bg.h
@@ -34,7 +34,7 @@ extern uint8 *additionalBgTable[9];
 extern uint8 currentAdditionalBgIdx;
 extern uint8 currentAdditionalBgIdx2;
 
-void addBackground(char *bgName, uint16 bgIdx);
+void addBackground(const char *bgName, uint16 bgIdx);
 
 extern uint16 bgVar0;
 
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index b874ca3501..4cd29923a4 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -197,8 +197,10 @@ static void initialize() {
 
 	textDataPtr = (uint8 *)malloc(8000);
 
-	partBuffer = (PartBuffer *)malloc(255 * sizeof(PartBuffer));
+	partBuffer = (PartBuffer *)malloc(NUM_MAX_PARTDATA * sizeof(PartBuffer));
 
+	animDataTable = (AnimData *)malloc(NUM_MAX_ANIMDATA * sizeof(AnimData));
+	
 	loadTextData("texte.dat", textDataPtr);
 	if (gameType == Cine::GID_FW)
 		snd_loadBasesonEntries("BASESON.SND");
@@ -235,7 +237,7 @@ static void initialize() {
 		relTable[i].obj2Param = 0;
 	}
 
-	for (i = 0; i < NUM_MAX_PARTDATA; i++) {
+	for (i = 0; i < NUM_MAX_ANIMDATA; i++) {
 		animDataTable[i].ptr1 = NULL;
 		animDataTable[i].ptr2 = NULL;
 	}
@@ -262,7 +264,7 @@ static void initialize() {
 	loadPrc(BOOT_PRC_NAME);
 	strcpy(currentPrcName, BOOT_PRC_NAME);
 
-	setMouseCursor(0);
+	setMouseCursor(MOUSE_CURSOR_NORMAL);
 }
 
 } // End of namespace Cine
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index b9a8b62e17..020e1a0f9c 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -27,6 +27,7 @@
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
+#include "common/util.h"
 
 #include "base/engine.h"
 
@@ -44,8 +45,6 @@
 
 namespace Cine {
 
-class AdlibMusic;
-
 enum CineGameId {
 	GID_FW = 1,
 	GID_OS
@@ -86,7 +85,11 @@ enum {
 	VAR_MOUSE_Y_POS = 250
 };
 
-extern AdlibMusic *g_cine_adlib;
+enum {
+	MOUSE_CURSOR_NORMAL = 0,
+	MOUSE_CURSOR_DISK,
+	MOUSE_CURSOR_CROSS
+};
 
 } // End of namespace Cine
 
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index c58db1579e..ea078aafe3 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -97,28 +97,27 @@ void init_video() {
 
 void setMouseCursor(int cursor) {
 	static int currentMouseCursor = -1;
-	if (cursor >= 0 && cursor < 3) {
-		if (currentMouseCursor != cursor) {
-			uint8 mouseCursor[16 * 16];
-			const MouseCursor *mc = &mouseCursors[cursor];
-			const uint8 *src = mc->bitmap;
-			for (int i = 0; i < 32; ++i) {
-				int offs = i * 8;
-				for (uint8 mask = 0x80; mask != 0; mask >>= 1) {
-					if (src[0] & mask) {
-						mouseCursor[offs] = 2;
-					} else if (src[32] & mask) {
-						mouseCursor[offs] = 0;
-					} else {
-						mouseCursor[offs] = 0xFF;
-					}
-					++offs;
+	assert(cursor >= 0 && cursor < 3);
+	if (currentMouseCursor != cursor) {
+		uint8 mouseCursor[16 * 16];
+		const MouseCursor *mc = &mouseCursors[cursor];
+		const uint8 *src = mc->bitmap;
+		for (int i = 0; i < 32; ++i) {
+			int offs = i * 8;
+			for (uint8 mask = 0x80; mask != 0; mask >>= 1) {
+				if (src[0] & mask) {
+					mouseCursor[offs] = 2;
+				} else if (src[32] & mask) {
+					mouseCursor[offs] = 0;
+				} else {
+					mouseCursor[offs] = 0xFF;
 				}
-				++src;
+				++offs;
 			}
-			g_system->setMouseCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY);
-			currentMouseCursor = cursor;
+			++src;
 		}
+		g_system->setMouseCursor(mouseCursor, 16, 16, mc->hotspotX, mc->hotspotY);
+		currentMouseCursor = cursor;
 	}
 }
 
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp
index c0e700d266..1a90a1af9f 100644
--- a/engines/cine/main_loop.cpp
+++ b/engines/cine/main_loop.cpp
@@ -161,9 +161,9 @@ void mainLoop(int bootScriptIdx) {
 		purgeList0();
 
 		if (playerCommand == -1) {
-			setMouseCursor(0);
+			setMouseCursor(MOUSE_CURSOR_NORMAL);
 		} else {
-			setMouseCursor(2);
+			setMouseCursor(MOUSE_CURSOR_CROSS);
 		}
 
 		drawOverlays();
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp
index d64111306a..9d4d6e9de3 100644
--- a/engines/cine/msg.cpp
+++ b/engines/cine/msg.cpp
@@ -54,7 +54,7 @@ void loadMsg(char *pMsgName) {
 
 	ptr = readBundleFile(findFileInBundle(pMsgName));
 
-	setMouseCursor(1);
+	setMouseCursor(MOUSE_CURSOR_DISK);
 
 	messageCount = READ_BE_UINT16(ptr); ptr += 2;
 
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index 62c764354f..e84c1bd029 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -67,7 +67,7 @@ void loadObject(char *pObjectName) {
 
 	ptr = readBundleFile(findFileInBundle(pObjectName));
 
-	setMouseCursor(1);
+	setMouseCursor(MOUSE_CURSOR_DISK);
 
 	numEntry = READ_BE_UINT16(ptr); ptr += 2;
 
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index 5918339df6..0643d011fa 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -30,13 +30,13 @@ namespace Cine {
 
 uint16 numElementInPart;
 
-AnimData animDataTable[NUM_MAX_PARTDATA];
+AnimData *animDataTable;
 PartBuffer *partBuffer;
 
 void loadPart(const char *partName) {
 	uint16 i;
 
-	for (i = 0; i < 255; i++) {
+	for (i = 0; i < NUM_MAX_PARTDATA; i++) {
 		partBuffer[i].partName[0] = 0;
 		partBuffer[i].offset = 0;
 		partBuffer[i].packedSize = 0;
@@ -53,7 +53,7 @@ void loadPart(const char *partName) {
 
 	ASSERT(partFileHandle.isOpen());
 
-	setMouseCursor(-1);
+	setMouseCursor(MOUSE_CURSOR_DISK);
 
 	numElementInPart = partFileHandle.readUint16BE();
 	partFileHandle.readUint16BE(); // entry size
@@ -183,7 +183,7 @@ int16 findFileInBundle(const char *fileName) {
 }
 
 void readFromPart(int16 idx, uint8 *dataPtr) {
-	setMouseCursor(1);
+	setMouseCursor(MOUSE_CURSOR_DISK);
 
 	partFileHandle.seek(partBuffer[idx].offset, SEEK_SET);
 	partFileHandle.read(dataPtr, partBuffer[idx].packedSize);
diff --git a/engines/cine/part.h b/engines/cine/part.h
index 95321462a5..aff3ae5096 100644
--- a/engines/cine/part.h
+++ b/engines/cine/part.h
@@ -57,7 +57,7 @@ struct AnimData {
 #define NUM_MAX_PARTDATA 255
 #define NUM_MAX_ANIMDATA 255
 
-extern AnimData animDataTable[NUM_MAX_ANIMDATA];
+extern AnimData *animDataTable;
 extern PartBuffer *partBuffer;
 
 void loadPart(const char *partName);
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index 4751bcb561..ebe066320d 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -81,7 +81,7 @@ void loadPrc(const char *pPrcName) {
     ASSERT_PTR(scriptPtr);
 	}
 
-	setMouseCursor(1);
+	setMouseCursor(MOUSE_CURSOR_DISK);
 
 	numScripts = READ_BE_UINT16(scriptPtr); scriptPtr += 2;
 	ASSERT(numScripts <= NUM_MAX_SCRIPT);
diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp
index 60d0a044d1..0fce94febf 100644
--- a/engines/cine/rel.cpp
+++ b/engines/cine/rel.cpp
@@ -69,7 +69,7 @@ void loadRel(char *pRelName) {
 
 	ptr = readBundleFile(findFileInBundle(pRelName));
 
-	setMouseCursor(1);
+	setMouseCursor(MOUSE_CURSOR_DISK);
 
 	numEntry = READ_BE_UINT16(ptr); ptr += 2;
 
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp
index b96916a396..0af946a650 100644
--- a/engines/cine/script.cpp
+++ b/engines/cine/script.cpp
@@ -1385,9 +1385,9 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 			{
 				DEBUG_SCRIPT(currentLine, "loadResource(\"%s\")", currentScriptPtr + currentPosition);
 
-				loadResource((char *)(currentScriptPtr + currentPosition));
+				loadResource((const char *)(currentScriptPtr + currentPosition));
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 
 				break;
 			}
@@ -1395,9 +1395,9 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 			{
 				DEBUG_SCRIPT(currentLine, "loadBg(\"%s\")", currentScriptPtr + currentPosition);
 
-				loadBg((char *)(currentScriptPtr + currentPosition));
+				loadBg((const char *)(currentScriptPtr + currentPosition));
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 
 				closeEngine7();
 
@@ -1409,9 +1409,9 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 			{
 				DEBUG_SCRIPT(currentLine, "loadCt(\"%s\")", currentScriptPtr + currentPosition);
 
-				loadCt((char *)(currentScriptPtr + currentPosition));
+				loadCt((const char *)(currentScriptPtr + currentPosition));
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 
 				break;
 			}
@@ -1420,9 +1420,9 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 				DEBUG_SCRIPT(currentLine, "loadPart(\"%s\")", currentScriptPtr + currentPosition);
 
 				if (gameType == Cine::GID_FW)
-					loadPart((char *)(currentScriptPtr + currentPosition));
+					loadPart((const char *)(currentScriptPtr + currentPosition));
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 				break;
 			}
 		case 0x40:
@@ -1446,30 +1446,30 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 				case 0:
 					{
 						DEBUG_SCRIPT(currentLine, "loadPrc(\"%s\")", currentScriptPtr + currentPosition);
-						strcpy(newPrcName, (char *)(currentScriptPtr + currentPosition));
+						strcpy(newPrcName, (const char *)(currentScriptPtr + currentPosition));
 						break;
 					}
 				case 1:
 					{
 						DEBUG_SCRIPT(currentLine, "loadRel(\"%s\")", currentScriptPtr + currentPosition);
-						strcpy(newRelName, (char *)(currentScriptPtr + currentPosition));
+						strcpy(newRelName, (const char *)(currentScriptPtr + currentPosition));
 						break;
 					}
 				case 2:
 					{
 						DEBUG_SCRIPT(currentLine, "loadObject(\"%s\")", currentScriptPtr + currentPosition);
-						strcpy(newObjectName, (char *)(currentScriptPtr + currentPosition));
+						strcpy(newObjectName, (const char *)(currentScriptPtr + currentPosition));
 						break;
 					}
 				case 3:
 					{
 						DEBUG_SCRIPT(currentLine, "loadMsg(\"%s\")", currentScriptPtr + currentPosition);
-						strcpy(newMsgName, (char *)(currentScriptPtr + currentPosition));
+						strcpy(newMsgName, (const char *)(currentScriptPtr + currentPosition));
 						break;
 					}
 				}
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition)) + 1;
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition)) + 1;
 				break;
 			}
 		case 0x42:
@@ -1687,7 +1687,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 			{
 				DEBUG_SCRIPT(currentLine, "comment(%s)", currentScriptPtr + currentPosition);
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 				break;
 			}
 		case 0x5A:
@@ -1701,7 +1701,7 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 				numIdx = *(currentScriptPtr + currentPosition);
 				currentPosition++;
 
-				ASSERT(startIdx + numIdx <= NUM_MAX_PARTDATA);
+				ASSERT(startIdx + numIdx <= NUM_MAX_ANIMDATA);
 
 				DEBUG_SCRIPT(currentLine, "freePartRange(%d,%d)", startIdx, numIdx);
 
@@ -1824,7 +1824,6 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 				currentPosition += 2;
 
 				/* unused */
-
 				currentPosition++;
 
 				volume = READ_BE_UINT16(currentScriptPtr + currentPosition);
@@ -2101,9 +2100,9 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 
 				DEBUG_SCRIPT(currentLine, "addBackground(%s,%d)", currentScriptPtr + currentPosition, temp);
 
-				addBackground((char *)(currentScriptPtr + currentPosition), temp);
+				addBackground((const char *)(currentScriptPtr + currentPosition), temp);
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 				break;
 			}
 		case 0x8F:
@@ -2138,9 +2137,9 @@ void executeScript(prcLinkedListStruct *scriptElement, uint16 params) {
 
 				DEBUG_SCRIPT(currentLine, "loadABS(%d,%s)", temp, currentScriptPtr + currentPosition);
 
-				loadAbs((char *)(currentScriptPtr + currentPosition), temp);
+				loadAbs((const char *)(currentScriptPtr + currentPosition), temp);
 
-				currentPosition += strlen((char *)(currentScriptPtr + currentPosition));
+				currentPosition += strlen((const char *)(currentScriptPtr + currentPosition));
 
 				break;
 			}
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 69e97b9091..fd14a1a684 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -675,7 +675,7 @@ int16 makeLoad(char *saveName) {
 	loadResourcesFromSave();
 	//reincrustAllBg();
 
-	setMouseCursor(0);
+	setMouseCursor(MOUSE_CURSOR_NORMAL);
 
 	if (strlen(currentDatName)) {
 /*		i = saveVar2;
@@ -869,7 +869,7 @@ void makeSave(char *saveFileName) {
 
 	fHandle.close();
 
-	setMouseCursor(0);
+	setMouseCursor(MOUSE_CURSOR_NORMAL);
 }
 
 void makeSystemMenu(void) {
@@ -2371,7 +2371,7 @@ void drawOverlays(void) {
 						AnimData *pPart;
 						int16 part = objPtr->part;
 
-						ASSERT(part >= 0 && part <= NUM_MAX_PARTDATA);
+						ASSERT(part >= 0 && part <= NUM_MAX_ANIMDATA);
 
 						pPart = &animDataTable[objPtr->frame];
 
@@ -2437,7 +2437,7 @@ void drawOverlays(void) {
 					AnimData *pPart;
 					int16 part = objPtr->part;
 
-					ASSERT(part >= 0 && part <= NUM_MAX_PARTDATA);
+					ASSERT(part >= 0 && part <= NUM_MAX_ANIMDATA);
 
 					pPart = &animDataTable[objPtr->frame];