[Scummvm-git-logs] scummvm master -> 25a12ad89a96b8373760728b9aefb58f8530fac2

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
25a12ad89a GRIFFON: Fix compilation on Amiga


Commit: 25a12ad89a96b8373760728b9aefb58f8530fac2
    https://github.com/scummvm/scummvm/commit/25a12ad89a96b8373760728b9aefb58f8530fac2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-14T00:15:00+01:00

Commit Message:
GRIFFON: Fix compilation on Amiga

Changed paths:
    engines/griffon/input.cpp
    engines/griffon/logic.cpp


diff --git a/engines/griffon/input.cpp b/engines/griffon/input.cpp
index cc6a48d..7bb33f7 100644
--- a/engines/griffon/input.cpp
+++ b/engines/griffon/input.cpp
@@ -379,7 +379,7 @@ void GriffonEngine::handleWalking() {
 	if (ramp == 3 && _movingLeft)
 		_movingDown = true;
 
-	unsigned int *temp/*, c*/, bgc;
+	uint32 *temp/*, c*/, bgc;
 
 	for (int x = -1; x <= 1; x++) {
 		for (int y = -1; y <= 1; y++) {
diff --git a/engines/griffon/logic.cpp b/engines/griffon/logic.cpp
index d1c3d8c..47d4911 100644
--- a/engines/griffon/logic.cpp
+++ b/engines/griffon/logic.cpp
@@ -2118,8 +2118,8 @@ void GriffonEngine::updateSpellsUnder() {
 						int sx = (newx / 2 + 6);
 						int sy = (newy / 2 + 10);
 
-						unsigned int *temp = (uint32 *)_clipBg->getBasePtr(sx, sy);
-						unsigned int dq = *temp;
+						uint32 *temp = (uint32 *)_clipBg->getBasePtr(sx, sy);
+						uint32 dq = *temp;
 
 						if (dq == 0) {
 							_npcInfo[f].x = newx;
@@ -2200,8 +2200,8 @@ void GriffonEngine::updateSpellsUnder() {
 								int sx = (xloc / 2 + 4);
 								int sy = (yloc / 2 + 8);
 
-								unsigned int *temp = (uint32 *)_clipBg->getBasePtr(sx, sy);
-								unsigned int dq = *temp;
+								uint32 *temp = (uint32 *)_clipBg->getBasePtr(sx, sy);
+								uint32 dq = *temp;
 
 								if (dq > 1000 && x > 4)
 									_spellInfo[i].legalive[f] = x;