DREAMWEB: Change various loop variables to uint, rather than size_t.

This is partly for readability and partly to avoid any possible
portability issues i.e. though they should be the same, size_t is
defined by system headers, whereas uint is defined within our build
system.

Also, replaced a array size calculation with our ARRAYSIZE macro.

10 files changed, 41 insertions, 41 deletions

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index f410ee16cf..5ccc68704a 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -30,18 +30,18 @@ void DreamWebEngine::doBlocks() {
 	const uint8 *mapData = _mapData + mapOffset;
 	uint8 *dstBuffer = workspace() + dstOffset;
 
-	for (size_t i = 0; i < 10; ++i) {
-		for (size_t j = 0; j < 11; ++j) {
+	for (uint i = 0; i < 10; ++i) {
+		for (uint j = 0; j < 11; ++j) {
 			uint16 blockType = mapData[j];
 			if (blockType != 0) {
 				uint8 *dst = dstBuffer + i * kScreenwidth * 16 + j * 16;
 				const uint8 *block = _backdropBlocks + blockType * 256;
-				for (size_t k = 0; k < 4; ++k) {
+				for (uint k = 0; k < 4; ++k) {
 					memcpy(dst, block, 16);
 					block += 16;
 					dst += kScreenwidth;
 				}
-				for (size_t k = 0; k < 12; ++k) {
+				for (uint k = 0; k < 12; ++k) {
 					memcpy(dst, block, 16);
 					memset(dst + 16, 0xdf, 4);
 					block += 16;
@@ -129,7 +129,7 @@ void DreamWebEngine::showAllObs() {
 	_setList.clear();
 
 	const GraphicsFile &frameBase = _setFrames;
-	for (size_t i = 0; i < 128; ++i) {
+	for (uint i = 0; i < 128; ++i) {
 		SetObject *setEntry = &_setDat[i];
 		uint16 x, y;
 		if (getMapAd(setEntry->mapad, &x, &y) == 0)
@@ -154,7 +154,7 @@ void DreamWebEngine::showAllObs() {
 }
 
 static bool addAlong(const MapFlag *mapFlags) {
-	for (size_t i = 0; i < 11; ++i) {
+	for (uint i = 0; i < 11; ++i) {
 		if (mapFlags[i]._flag != 0)
 			return true;
 	}
@@ -162,7 +162,7 @@ static bool addAlong(const MapFlag *mapFlags) {
 }
 
 static bool addLength(const MapFlag *mapFlags) {
-	for (size_t i = 0; i < 10; ++i) {
+	for (uint i = 0; i < 10; ++i) {
 		if (mapFlags[11 * i]._flag != 0)
 			return true;
 	}
@@ -205,13 +205,13 @@ void DreamWebEngine::calcMapAd() {
 }
 
 void DreamWebEngine::showAllFree() {
-	const unsigned int count = 80;
+	const uint count = 80;
 
 	_freeList.clear();
 
 	const DynObject *freeObjects = _freeDat;
 	const GraphicsFile &frameBase = _freeFrames;
-	for (size_t i = 0; i < count; ++i) {
+	for (uint i = 0; i < count; ++i) {
 		uint16 x, y;
 		uint8 mapAd = getMapAd(freeObjects[i].mapad, &x, &y);
 		if (mapAd != 0) {
@@ -236,8 +236,8 @@ void DreamWebEngine::drawFlags() {
 	uint16 mapOffset = _mapY * kMapWidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 
-	for (size_t i = 0; i < 10; ++i) {
-		for (size_t j = 0; j < 11; ++j) {
+	for (uint i = 0; i < 10; ++i) {
+		for (uint j = 0; j < 11; ++j) {
 			uint8 tile = mapData[i * kMapWidth + j];
 			mapFlag->_flag = _backdropFlags[tile]._flag;
 			mapFlag->_flagEx = _backdropFlags[tile]._flagEx;
@@ -248,13 +248,13 @@ void DreamWebEngine::drawFlags() {
 }
 
 void DreamWebEngine::showAllEx() {
-	const unsigned int count = 100;
+	const uint count = 100;
 
 	_exList.clear();
 
 	DynObject *objects = _exData;
 	const GraphicsFile &frameBase = _exFrames;
-	for (size_t i = 0; i < count; ++i) {
+	for (uint i = 0; i < count; ++i) {
 		DynObject *object = objects + i;
 		if (object->mapad[0] == 0xff)
 			continue;
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 28d073ec2f..7bbca2b979 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -433,7 +433,7 @@ void DreamWebEngine::folderExit() {
 void DreamWebEngine::showLeftPage() {
 	showFrame(_folderGraphics2, 0, 12, 3, 0);
 	uint16 y = 12+5;
-	for (size_t i = 0; i < 9; ++i) {
+	for (uint i = 0; i < 9; ++i) {
 		showFrame(_folderGraphics2, 0, y, 4, 0);
 		y += 16;
 	}
@@ -444,7 +444,7 @@ void DreamWebEngine::showLeftPage() {
 	uint8 pageIndex = _folderPage - 2;
 	const uint8 *string = getTextInFile1(pageIndex * 2);
 	y = 48;
-	for (size_t i = 0; i < 2; ++i) {
+	for (uint i = 0; i < 2; ++i) {
 		uint8 lastChar;
 		do {
 			lastChar = printDirect(&string, 2, &y, 140, false);
@@ -455,8 +455,8 @@ void DreamWebEngine::showLeftPage() {
 	_charShift = 0;
 	_lineSpacing = 10;
 	uint8 *bufferToSwap = workspace() + (48*kScreenwidth)+2;
-	for (size_t i = 0; i < 120; ++i) {
-		for (size_t j = 0; j < 65; ++j) {
+	for (uint i = 0; i < 120; ++i) {
+		for (uint j = 0; j < 65; ++j) {
 			SWAP(bufferToSwap[j], bufferToSwap[130 - j]);
 		}
 		bufferToSwap += kScreenwidth;
@@ -466,7 +466,7 @@ void DreamWebEngine::showLeftPage() {
 void DreamWebEngine::showRightPage() {
 	showFrame(_folderGraphics2, 143, 12, 0, 0);
 	uint16 y = 12+37;
-	for (size_t i = 0; i < 7; ++i) {
+	for (uint i = 0; i < 7; ++i) {
 		showFrame(_folderGraphics2, 143, y, 1, 0);
 		y += 16;
 	}
@@ -477,7 +477,7 @@ void DreamWebEngine::showRightPage() {
 	uint8 pageIndex = _folderPage - 1;
 	const uint8 *string = getTextInFile1(pageIndex * 2);
 	y = 48;
-	for (size_t i = 0; i < 2; ++i) {
+	for (uint i = 0; i < 2; ++i) {
 		uint8 lastChar;
 		do {
 			lastChar = printDirect(&string, 152, &y, 140, false);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 83563c8005..b6922cba51 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -373,7 +373,7 @@ void DreamWebEngine::lockLightOff() {
 }
 
 void DreamWebEngine::turnOnPower() {
-	for (size_t i = 0; i < 3; ++i) {
+	for (uint i = 0; i < 3; ++i) {
 		powerLightOn();
 		hangOn(30);
 		powerLightOff();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 1af9b036aa..bb9e9677d7 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -31,7 +31,7 @@ void DreamWebEngine::showRyanPage() {
 
 void DreamWebEngine::findAllRyan() {
 	memset(_ryanInvList, 0xff, sizeof(_ryanInvList));
-	for (size_t i = 0; i < kNumexobjects; ++i) {
+	for (uint i = 0; i < kNumexobjects; ++i) {
 		const DynObject *extra = getExAd(i);
 		if (extra->mapad[0] != kExObjectType)
 			continue;
@@ -47,8 +47,8 @@ void DreamWebEngine::findAllRyan() {
 void DreamWebEngine::fillRyan() {
 	ObjectRef *inv = &_ryanInvList[_vars._ryanPage * 10];
 	findAllRyan();
-	for (size_t i = 0; i < 2; ++i) {
-		for (size_t j = 0; j < 5; ++j) {
+	for (uint i = 0; i < 2; ++i) {
+		for (uint j = 0; j < 5; ++j) {
 			obToInv(inv->_index, inv->_type, kInventx + j * kItempicsize, kInventy + i * kItempicsize);
 			++inv;
 		}
@@ -1130,7 +1130,7 @@ void DreamWebEngine::emergencyPurge() {
 void DreamWebEngine::purgeAnItem() {
 	const DynObject *extraObjects = _exData;
 
-	for (size_t i = 0; i < kNumexobjects; ++i) {
+	for (uint i = 0; i < kNumexobjects; ++i) {
 		if (extraObjects[i].mapad[0] && extraObjects[i].objId[0] == 255 &&
 			extraObjects[i].initialLocation != _realLocation) {
 			deleteExObject(i);
@@ -1138,7 +1138,7 @@ void DreamWebEngine::purgeAnItem() {
 		}
 	}
 
-	for (size_t i = 0; i < kNumexobjects; ++i) {
+	for (uint i = 0; i < kNumexobjects; ++i) {
 		if (extraObjects[i].mapad[0] && extraObjects[i].objId[0] == 255) {
 			deleteExObject(i);
 			return;
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index c39070532c..64cffde4de 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -110,7 +110,7 @@ void DreamWebEngine::checkDest(const RoomPaths *roomsPaths) {
 	const PathSegment *segments = roomsPaths->segments;
 	const uint8 tmp = _mansPath << 4;
 	uint8 destination = _destination;
-	for (size_t i = 0; i < 24; ++i) {
+	for (uint i = 0; i < 24; ++i) {
 		if ((segments[i].b0 & 0xf0) == tmp &&
 		    (segments[i].b0 & 0x0f) == _destination) {
 			_destination = segments[i].b1 & 0x0f;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 01570c907a..1fa2e7d6a4 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -26,7 +26,7 @@
 namespace DreamWeb {
 
 void DreamWebEngine::printSprites() {
-	for (size_t priority = 0; priority < 7; ++priority) {
+	for (uint priority = 0; priority < 7; ++priority) {
 		Common::List<Sprite>::const_iterator i;
 		for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
 			const Sprite &sprite = *i;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8eeaf00c7f..d93c2a951c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1142,7 +1142,7 @@ void DreamWebEngine::plotReel(uint16 &reelPointer) {
 		reel += 8;
 	}
 
-	for (size_t i = 0; i < 8; ++i) {
+	for (uint i = 0; i < 8; ++i) {
 		if (reel->frame() != 0xffff)
 			showReelFrame(reel);
 		++reel;
@@ -1241,7 +1241,7 @@ const uint8 *DreamWebEngine::findObName(uint8 type, uint8 index) {
 
 void DreamWebEngine::copyName(uint8 type, uint8 index, uint8 *dst) {
 	const uint8 *src = findObName(type, index);
-	size_t i;
+	uint i;
 	for (i = 0; i < 28; ++i) {
 		char c = src[i];
 		if (c == ':')
@@ -1371,7 +1371,7 @@ void DreamWebEngine::doChange(uint8 index, uint8 value, uint8 type) {
 }
 
 void DreamWebEngine::deleteTaken() {
-	for (size_t i = 0; i < kNumexobjects; ++i) {
+	for (uint i = 0; i < kNumexobjects; ++i) {
 		uint8 location = _exData[i].initialLocation;
 		if (location == _realLocation) {
 			uint8 index = _exData[i].index;
@@ -1382,7 +1382,7 @@ void DreamWebEngine::deleteTaken() {
 
 uint8 DreamWebEngine::getExPos() {
 	DynObject *objects = _exData;
-	for (size_t i = 0; i < kNumexobjects; ++i) {
+	for (uint i = 0; i < kNumexobjects; ++i) {
 		if (objects[i].mapad[0] == 0xff)
 			return i;
 	}
@@ -1537,7 +1537,7 @@ void DreamWebEngine::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWid
 
 bool DreamWebEngine::objectMatches(void *object, const char *id) {
 	const char *objId = (const char *)object + 12; // whether it is a DynObject or a SetObject
-	for (size_t i = 0; i < 4; ++i) {
+	for (uint i = 0; i < 4; ++i) {
 		if (id[i] != objId[i] + 'A')
 			return false;
 	}
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 995eef04cd..476f847c40 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -131,7 +131,7 @@ void DreamWebEngine::useRoutine() {
 	uint8 dummy;
 	void *obj = getAnyAd(&dummy, &dummy);
 
-	for (size_t i = 0; i < sizeof(kUseList)/sizeof(UseListEntry); ++i) {
+	for (uint i = 0; i < ARRAYSIZE(kUseList); ++i) {
 		const UseListEntry &entry = kUseList[i];
 		if (objectMatches(obj, entry.id)) {
 			(this->*entry.callback)();
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index c8f05641b5..d1e2480f70 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -56,8 +56,8 @@ void DreamWebEngine::fadeDOS() {
 	//processEvents will be called from waitForVSync
 	uint8 *dst = _startPal;
 	getPalette(dst, 0, 64);
-	for (int fade = 0; fade < 64; ++fade) {
-		for (int c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
+	for (uint fade = 0; fade < 64; ++fade) {
+		for (uint c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
 			if (dst[c]) {
 				--dst[c];
 			}
@@ -88,7 +88,7 @@ void DreamWebEngine::fadeCalculation() {
 
 	uint8 *startPal = _startPal;
 	const uint8 *endPal = _endPal;
-	for (size_t i = 0; i < 256 * 3; ++i) {
+	for (uint i = 0; i < 256 * 3; ++i) {
 		uint8 s = startPal[i];
 		uint8 e = endPal[i];
 		if (s == e)
@@ -212,7 +212,7 @@ void DreamWebEngine::fadeScreenDownHalf() {
 
 	const uint8 *startPal = _startPal;
 	uint8 *endPal = _endPal;
-	for (int i = 0; i < 256 * 3; ++i) {
+	for (uint i = 0; i < 256 * 3; ++i) {
 		*endPal >>= 1;
 		endPal++;
 	}
@@ -239,7 +239,7 @@ void DreamWebEngine::greyscaleSum() {
 	byte *src = _mainPal;
 	byte *dst = _endPal;
 
-	for (int i = 0; i < 256; ++i) {
+	for (uint i = 0; i < 256; ++i) {
 		const unsigned int r = 20 * *src++;
 		const unsigned int g = 59 * *src++;
 		const unsigned int b = 11 * *src++;
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 94b470bb81..d8984d312b 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -334,8 +334,8 @@ void DreamWebEngine::zoom() {
 	uint16 dstOffset = (kZoomy + 4) * kScreenwidth + (kZoomx + 5);
 	const uint8 *src = workspace() + srcOffset;
 	uint8 *dst = workspace() + dstOffset;
-	for (size_t i = 0; i < 20; ++i) {
-		for (size_t j = 0; j < 23; ++j) {
+	for (uint i = 0; i < 20; ++i) {
+		for (uint j = 0; j < 23; ++j) {
 			uint8 v = src[j];
 			dst[2*j+0] = v;
 			dst[2*j+1] = v;
@@ -379,7 +379,7 @@ void DreamWebEngine::loadPalFromIFF() {
 
 	const uint8 *src = buf + 0x30;
 	uint8 *dst = _mainPal;
-	for (size_t i = 0; i < 256*3; ++i) {
+	for (uint i = 0; i < 256*3; ++i) {
 		uint8 c = src[i] / 4;
 		if (_brightPalette) {
 			if (c) {