Fixed some more warnings observed on buildbot

svn-id: r42010

3 files changed, 33 insertions, 50 deletions

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 372fcd9e45..f29be071e0 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1816,9 +1816,8 @@ void ScummEngine::loadFlObject(uint object, uint room) {
 	assert(flob);
 
 	// Copy object code + object image to floating object
-	((uint32 *)flob)[0] = MKID_BE('FLOB');
-	((uint32 *)flob)[1] = TO_BE_32(flob_size);
-
+	WRITE_UINT32(flob, MKID_BE('FLOB'));
+	WRITE_BE_UINT32(flob + 4, flob_size);
 	memcpy(flob + 8, foir.obcd, obcd_size);
 	memcpy(flob + 8 + obcd_size, foir.obim, obim_size);
 
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index a2cd4a0d4d..c356e7a06c 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -470,13 +470,9 @@ void ScummEngine::moveMemInPalRes(int start, int end, byte direction) {
 }
 
 void ScummEngine::palManipulateInit(int resID, int start, int end, int time) {
-	byte *pal, *target, *between;
-	byte *string1, *string2, *string3;
-	int i;
-
-	string1 = getStringAddress(resID);
-	string2 = getStringAddress(resID + 1);
-	string3 = getStringAddress(resID + 2);
+	byte *string1 = getStringAddress(resID);
+	byte *string2 = getStringAddress(resID + 1);
+	byte *string3 = getStringAddress(resID + 2);
 	if (!string1 || !string2 || !string3) {
 		error("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d",
 				resID, start, end, time, resID, resID + 1, resID + 2);
@@ -496,29 +492,24 @@ void ScummEngine::palManipulateInit(int resID, int start, int end, int time) {
 	if (!_palManipIntermediatePal)
 		_palManipIntermediatePal = (byte *)calloc(0x600, 1);
 
-	pal = _currentPalette + start * 3;
-	target = _palManipPalette + start * 3;
-	between = _palManipIntermediatePal + start * 6;
+	byte *pal = _currentPalette + start * 3;
+	byte *target = _palManipPalette + start * 3;
+	uint16 *between = (uint16 *)(_palManipIntermediatePal + start * 6);
 
-	for (i = start; i < end; ++i) {
+	for (int i = start; i < end; ++i) {
 		*target++ = *string1++;
 		*target++ = *string2++;
 		*target++ = *string3++;
-		*(uint16 *)between = ((uint16) *pal++) << 8;
-		between += 2;
-		*(uint16 *)between = ((uint16) *pal++) << 8;
-		between += 2;
-		*(uint16 *)between = ((uint16) *pal++) << 8;
-		between += 2;
+		*between++ = ((uint16) *pal++) << 8;
+		*between++ = ((uint16) *pal++) << 8;
+		*between++ = ((uint16) *pal++) << 8;
 	}
 
 	_palManipCounter = time;
 }
 
 void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time) {
-	byte *pal, *target, *between;
 	const byte *new_pal;
-	int i;
 
 	new_pal = getPalettePtr(resID, _roomResource);
 
@@ -533,20 +524,17 @@ void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time)
 	if (!_palManipIntermediatePal)
 		_palManipIntermediatePal = (byte *)calloc(0x600, 1);
 
-	pal = _currentPalette + start * 3;
-	target = _palManipPalette + start * 3;
-	between = _palManipIntermediatePal + start * 6;
+	byte *pal = _currentPalette + start * 3;
+	byte *target = _palManipPalette + start * 3;
+	uint16 *between = (uint16 *)(_palManipIntermediatePal + start * 6);
 
-	for (i = start; i < end; ++i) {
+	for (int i = start; i < end; ++i) {
 		*target++ = *new_pal++;
 		*target++ = *new_pal++;
 		*target++ = *new_pal++;
-		*(uint16 *)between = ((uint16) *pal++) << 8;
-		between += 2;
-		*(uint16 *)between = ((uint16) *pal++) << 8;
-		between += 2;
-		*(uint16 *)between = ((uint16) *pal++) << 8;
-		between += 2;
+		*between++ = ((uint16) *pal++) << 8;
+		*between++ = ((uint16) *pal++) << 8;
+		*between++ = ((uint16) *pal++) << 8;
 	}
 
 	_palManipCounter = time;
@@ -554,26 +542,24 @@ void ScummEngine_v6::palManipulateInit(int resID, int start, int end, int time)
 
 
 void ScummEngine::palManipulate() {
-	byte *target, *pal, *between;
-	int i, j;
-
 	if (!_palManipCounter || !_palManipPalette || !_palManipIntermediatePal)
 		return;
 
-	target = _palManipPalette + _palManipStart * 3;
-	pal = _currentPalette + _palManipStart * 3;
-	between = _palManipIntermediatePal + _palManipStart * 6;
+	byte *target = _palManipPalette + _palManipStart * 3;
+	byte *pal = _currentPalette + _palManipStart * 3;
+	uint16 *between = (uint16 *)(_palManipIntermediatePal + _palManipStart * 6);
 
-	for (i = _palManipStart; i < _palManipEnd; ++i) {
-		j = (*((uint16 *)between) += ((*target++ << 8) - *((uint16 *)between)) / _palManipCounter);
+	for (int i = _palManipStart; i < _palManipEnd; ++i) {
+		int j;
+		j = (*between += ((*target++ << 8) - *between) / _palManipCounter);
 		*pal++ = j >> 8;
-		between += 2;
-		j = (*((uint16 *)between) += ((*target++ << 8) - *((uint16 *)between)) / _palManipCounter);
+		between++;
+		j = (*between += ((*target++ << 8) - *between) / _palManipCounter);
 		*pal++ = j >> 8;
-		between += 2;
-		j = (*((uint16 *)between) += ((*target++ << 8) - *((uint16 *)between)) / _palManipCounter);
+		between++;
+		j = (*between += ((*target++ << 8) - *between) / _palManipCounter);
 		*pal++ = j >> 8;
-		between += 2;
+		between++;
 	}
 	setDirtyColors(_palManipStart, _palManipEnd);
 	_palManipCounter--;
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 874b787615..4638c40828 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -787,8 +787,6 @@ void ResourceManager::setResourceCounter(int type, int idx, byte flag) {
 #define SAFETY_AREA 2
 
 byte *ResourceManager::createResource(int type, int idx, uint32 size) {
-	byte *ptr;
-
 	debugC(DEBUG_RESOURCE, "_res->createResource(%s,%d,%d)", resTypeFromId(type), idx, size);
 
 	if (!validateResource("allocating", type, idx))
@@ -807,17 +805,17 @@ byte *ResourceManager::createResource(int type, int idx, uint32 size) {
 
 	expireResources(size);
 
-	ptr = (byte *)calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
+	void *ptr = calloc(size + sizeof(MemBlkHeader) + SAFETY_AREA, 1);
 	if (ptr == NULL) {
 		error("createResource(%s,%d): Out of memory while allocating %d", resTypeFromId(type), idx, size);
 	}
 
 	_allocatedSize += size;
 
-	address[type][idx] = ptr;
+	address[type][idx] = (byte *)ptr;
 	((MemBlkHeader *)ptr)->size = size;
 	setResourceCounter(type, idx, 1);
-	return ptr + sizeof(MemBlkHeader);	/* skip header */
+	return (byte *)ptr + sizeof(MemBlkHeader);	/* skip header */
 }
 
 ResourceManager::ResourceManager(ScummEngine *vm) {