SLUDGE: replace int types to scummvm defined ones

engines/sludge/backdrop.cpp

@@ -70,9 +70,9 @@ int lightMapMode = LIGHTMAPMODE_PIXEL;
 parallaxLayer *parallaxStuff = NULL;
 int cameraPX = 0, cameraPY = 0;
 
-unsigned int sceneWidth, sceneHeight;
+uint sceneWidth, sceneHeight;
 int lightMapNumber;
-unsigned int currentBlankColour = TS_ARGB(255, 0, 0, 0);
+uint currentBlankColour = TS_ARGB(255, 0, 0, 0);
 
 extern int cameraX, cameraY;
 extern float cameraZoom;
@@ -147,14 +147,14 @@ bool snapshot() {
 }
 
 bool restoreSnapshot(Common::SeekableReadStream *stream) {
-	unsigned int picWidth = stream->readUint16BE();
-	unsigned int picHeight = stream->readUint16BE();
+	uint picWidth = stream->readUint16BE();
+	uint picHeight = stream->readUint16BE();
 
 	if ((picWidth != winWidth) || (picHeight != winHeight))
 		return false;
 
-	unsigned int t1, t2, n;
-	unsigned short c;
+	uint t1, t2, n;
+	uint16 c;
 #if 0
 	GLubyte *target;
 	if (!NPOT_textures) {
@@ -170,7 +170,7 @@ bool restoreSnapshot(Common::SeekableReadStream *stream) {
 	for (t2 = 0; t2 < winHeight; t2++) {
 		t1 = 0;
 		while (t1 < winWidth) {
-			c = (unsigned short)stream->readUint16BE();
+			c = (uint16)stream->readUint16BE();
 			if (c & 32) {
 				n = stream->readByte() + 1;
 				c -= 32;
@@ -416,11 +416,11 @@ void hardScroll(int distance) {
 
 	setPixelCoords(true);
 
-	unsigned int xoffset = 0;
+	uint xoffset = 0;
 	while (xoffset < sceneWidth) {
 		int w = (sceneWidth - xoffset < viewportWidth) ? sceneWidth - xoffset : viewportWidth;
 
-		unsigned int yoffset = 0;
+		uint yoffset = 0;
 		while (yoffset < sceneHeight) {
 			int h = (sceneHeight - yoffset < viewportHeight) ? sceneHeight - yoffset : viewportHeight;
 
@@ -457,11 +457,11 @@ void hardScroll(int distance) {
 #endif
 }
 
-void drawVerticalLine(unsigned int x, unsigned int y1, unsigned int y2) {
+void drawVerticalLine(uint x, uint y1, uint y2) {
 	drawLine(x, y1, x, y2);
 }
 
-void drawHorizontalLine(unsigned int x1, unsigned int y, unsigned int x2) {
+void drawHorizontalLine(uint x1, uint y, uint x2) {
 	drawLine(x1, y, x2, y);
 }
 
@@ -652,7 +652,7 @@ void reloadParallaxTextures() {
 #endif
 }
 
-bool loadParallax(unsigned short v, unsigned short fracX, unsigned short fracY) {
+bool loadParallax(uint16 v, uint16 fracX, uint16 fracY) {
 	setResourceForFatal(v);
 	if (!openFileFromNum(v))
 		return fatal("Can't open parallax image");
@@ -1055,7 +1055,7 @@ void saveCoreHSI(Common::WriteStream *stream, GLuint texture, int w, int h) {
 	setPixelCoords(false);
 
 	int x, y, lookAhead;
-	unsigned short int *fromHere, *lookPointer;
+	uint16 *fromHere, *lookPointer;
 
 	stream->writeUint16BE(w);
 	stream->writeUint16BE(h);
@@ -1101,7 +1101,7 @@ void saveParallaxRecursive(parallaxLayer *me, Common::WriteStream *stream) {
 	}
 }
 
-bool getRGBIntoStack(unsigned int x, unsigned int y, stackHandler *sH) {
+bool getRGBIntoStack(uint x, uint y, stackHandler *sH) {
 #if 0
 	if (x >= sceneWidth || y >= sceneHeight) {
 		return fatal("Co-ordinates are outside current scene!");

engines/sludge/backdrop.h

@@ -35,14 +35,14 @@ enum {
 	LIGHTMAPMODE_NUM
 };
 
-extern unsigned int winWidth, winHeight, sceneWidth, sceneHeight;
+extern uint winWidth, winHeight, sceneWidth, sceneHeight;
 extern int lightMapMode;
 
 struct parallaxLayer {
 	Graphics::Surface surface;
 	int speedX, speedY;
 	bool wrapS, wrapT;
-	unsigned short fileNum, fractionX, fractionY;
+	uint16 fileNum, fractionX, fractionY;
 	int cameraX, cameraY;
 	parallaxLayer *next;
 	parallaxLayer *prev;
@@ -63,10 +63,10 @@ void saveCoreHSI(Common::WriteStream *stream, GLuint texture, int w, int h);
 #endif
 bool loadHSI(Common::SeekableReadStream *stream, int, int, bool);
 bool mixHSI(Common::SeekableReadStream *stream, int x = 0, int y = 0);
-void drawHorizontalLine(unsigned int, unsigned int, unsigned int);
-void drawVerticalLine(unsigned int, unsigned int, unsigned int);
+void drawHorizontalLine(uint, uint, uint);
+void drawVerticalLine(uint, uint, uint);
 void hardScroll(int distance);
-bool getRGBIntoStack(unsigned int x, unsigned int y, stackHandler *sH);
+bool getRGBIntoStack(uint x, uint y, stackHandler *sH);
 
 // Also the light map stuff
 
@@ -78,7 +78,7 @@ extern Graphics::Surface lightMap;
 // And background parallax scrolling
 
 void killParallax();
-bool loadParallax(unsigned short v, unsigned short fracX, unsigned short fracY);
+bool loadParallax(uint16 v, uint16 fracX, uint16 fracY);
 void saveParallaxRecursive(parallaxLayer *me, Common::WriteStream *fp);
 void reloadParallaxTextures();
 

engines/sludge/bg_effects.cpp

@@ -32,7 +32,7 @@
 namespace Sludge {
 
 #if 0
-//extern unsigned short int * * backDropImage;
+//extern uint16 * * backDropImage;
 extern GLuint backdropTextureName;
 #endif
 
@@ -147,7 +147,7 @@ void blur_loadSettings(Common::SeekableReadStream *stream) {
 	s_matrixEffectBase = stream->readUint32LE();
 
 	if (blur_allocateMemoryForEffect()) {
-		size_t bytes_read = stream->read(s_matrixEffectData, sizeof(int) * s_matrixEffectWidth * s_matrixEffectHeight);
+		uint bytes_read = stream->read(s_matrixEffectData, sizeof(int) * s_matrixEffectWidth * s_matrixEffectHeight);
 		if (bytes_read != sizeof(int) * s_matrixEffectWidth * s_matrixEffectHeight && stream->err()) {
 			debug("Reading error in blur_loadSettings.");
 		}
@@ -254,7 +254,7 @@ static inline int clampi(int i, int min, int max) {
 	return (i >= max) ? max : ((i <= min) ? min : i);
 }
 
-static inline void blur_createSourceLine(unsigned char *createLine, unsigned char *fromLine, int overlapOnLeft, int width) {
+static inline void blur_createSourceLine(byte *createLine, byte *fromLine, int overlapOnLeft, int width) {
 	int miniX;
 	memcpy(createLine + overlapOnLeft * 4, fromLine, width * 4);
 
@@ -274,13 +274,13 @@ static inline void blur_createSourceLine(unsigned char *createLine, unsigned cha
 bool blurScreen() {
 #if 0
 	if (s_matrixEffectWidth && s_matrixEffectHeight && s_matrixEffectDivide && s_matrixEffectData) {
-		unsigned char *thisLine;
+		byte *thisLine;
 		int y, x;
 		bool ok = true;
 		int overlapOnLeft = s_matrixEffectWidth / 2;
 		int overlapAbove = s_matrixEffectHeight / 2;
 
-		unsigned char **sourceLine = new unsigned char *[s_matrixEffectHeight];
+		byte **sourceLine = new byte *[s_matrixEffectHeight];
 		if (!checkNew(sourceLine))
 			return false;
 
@@ -296,7 +296,7 @@ bool blurScreen() {
 		saveTexture(backdropTextureName, backdropTexture);
 
 		for (y = 0; y < s_matrixEffectHeight; y++) {
-			sourceLine[y] = new unsigned char[(s_matrixEffectWidth - 1 + picWidth) * 4];
+			sourceLine[y] = new byte[(s_matrixEffectWidth - 1 + picWidth) * 4];
 			ok &= (sourceLine[y] != NULL);
 		}
 
@@ -313,7 +313,7 @@ bool blurScreen() {
 				//-------------------------
 				// Scroll source lines
 				//-------------------------
-				unsigned char *tempLine = sourceLine[0];
+				byte *tempLine = sourceLine[0];
 				for (int miniY = 0; miniY < s_matrixEffectHeight - 1; miniY++) {
 					sourceLine[miniY] = sourceLine[miniY + 1];
 				}
@@ -330,7 +330,7 @@ bool blurScreen() {
 					int totalBlue = 0;
 					int *matrixElement = s_matrixEffectData;
 					for (int miniY = 0; miniY < s_matrixEffectHeight; ++miniY) {
-						unsigned char *pixel = &sourceLine[miniY][x * 4];
+						byte *pixel = &sourceLine[miniY][x * 4];
 						for (int miniX = 0; miniX < s_matrixEffectWidth; ++miniX) {
 
 							totalRed += pixel[0] * *matrixElement;

engines/sludge/builtin.cpp

@@ -66,13 +66,13 @@ variable *launchResult = NULL;
 extern int lastFramesPerSecond, thumbWidth, thumbHeight;
 extern bool allowAnyFilename;
 extern bool captureAllKeys;
-extern short fontSpace;
+extern int16 fontSpace;
 extern eventHandlers *currentEvents;
 extern variableStack *noStack;
 extern statusStuff *nowStatus;
 extern screenRegion *overRegion;
 extern HWND hMainWindow;
-extern unsigned int sceneWidth, sceneHeight;
+extern uint sceneWidth, sceneHeight;
 extern int numBIFNames, numUserFunc;
 extern char builtInFunctionNames[][25];
 
@@ -86,13 +86,13 @@ extern GLuint backdropTextureName;
 #endif
 
 extern float speechSpeed;
-extern unsigned char brightnessLevel;
-extern unsigned char fadeMode;
-extern unsigned short saveEncoding;
+extern byte brightnessLevel;
+extern byte fadeMode;
+extern uint16 saveEncoding;
 extern frozenStuffStruct *frozenStuff;
-extern unsigned int currentBlankColour;
-extern unsigned int languageID;
-extern unsigned char currentBurnR, currentBurnG, currentBurnB;
+extern uint currentBlankColour;
+extern uint languageID;
+extern byte currentBurnR, currentBurnG, currentBurnB;
 
 int paramNum[] = { -1, 0, 1, 1, -1, -1, 1, 3, 4, 1, 0, 0, 8, -1,    // SAY->MOVEMOUSE
                    -1, 0, 0, -1, -1, 1, 1, 1, 1, 4, 1, 1, 2, 1,// FOCUS->REMOVEREGION
@@ -1633,7 +1633,7 @@ builtIn(setScale) {
 	if (!getValueType(val1, SVT_INT, fun->stack->thisVar))
 		return BR_ERROR;
 	trimStack(fun->stack);
-	setScale((short int)val1, (short int)val2);
+	setScale((int16)val1, (int16)val2);
 	return BR_CONTINUE;
 }
 
@@ -1898,7 +1898,7 @@ builtIn(alignStatus) {
 	if (!getValueType(val, SVT_INT, fun->stack->thisVar))
 		return BR_ERROR;
 	trimStack(fun->stack);
-	nowStatus->alignStatus = (short)val;
+	nowStatus->alignStatus = (int16)val;
 	return BR_CONTINUE;
 }
 

engines/sludge/fileset.cpp

@@ -74,7 +74,7 @@ bool openObjectSlice(int num) {
 	return sliceBusy = true;
 }
 
-unsigned int openFileFromNum(int num) {
+uint openFileFromNum(int num) {
 //	FILE * dbug = fopen ("debuggy.txt", "at");
 
 	if (sliceBusy) {
@@ -124,16 +124,16 @@ char *convertString(char *s) {
 		}
 	}
 
-	size_t len1 = strlen(s) + 1;
-	size_t len2 = 65535;
-	size_t iconv_value =
+	uint len1 = strlen(s) + 1;
+	uint len2 = 65535;
+	uint iconv_value =
 #ifdef _WIN32
 	iconv(convert, (const char **) tmp1, &len1, tmp2, &len2);
 #else
 	iconv(convert, (char **) tmp1, &len1, tmp2, &len2);
 #endif
 
-	if (iconv_value == (size_t) - 1) {
+	if (iconv_value == (uint) - 1) {
 		switch (errno) {
 			/* See "man 3 iconv" for an explanation. */
 			case EILSEQ:
@@ -190,7 +190,7 @@ void finishAccess() {
 
 int32_t startIndex;
 
-void setFileIndices(Common::File *fp, int numLanguages, unsigned int skipBefore) {
+void setFileIndices(Common::File *fp, int numLanguages, uint skipBefore) {
 	if (fp) {
 		// Keep hold of the file handle, and let things get at it
 		bigDataFile = fp;

engines/sludge/fileset.h

@@ -28,9 +28,9 @@ namespace Sludge {
 
 extern Common::File *bigDataFile;
 
-void setFileIndices(Common::File *fp, int, unsigned int);
+void setFileIndices(Common::File *fp, int, uint);
 
-unsigned int openFileFromNum(int num);
+uint openFileFromNum(int num);
 bool openSubSlice(int num);
 bool openObjectSlice(int num);
 char *getNumberedString(int value);

engines/sludge/fonttext.cpp

@@ -33,7 +33,7 @@ namespace Sludge {
 spriteBank theFont;
 int fontHeight = 0, numFontColours, loadedFontNum;
 Common::U32String fontOrderString;
-short fontSpace = -1;
+int16 fontSpace = -1;
 
 uint32 *fontTable = NULL;
 uint fontTableSize = 0;

engines/sludge/freeze.cpp

@@ -51,12 +51,12 @@ extern eventHandlers *currentEvents;
 extern personaAnimation *mouseCursorAnim;
 extern int mouseCursorFrameNum;
 extern int cameraX, cameraY;
-extern unsigned int sceneWidth, sceneHeight;
+extern uint sceneWidth, sceneHeight;
 extern float cameraZoom;
 extern zBufferData zBuffer;
 extern bool backdropExists;
 frozenStuffStruct *frozenStuff = NULL;
-extern unsigned int sceneWidth, sceneHeight;
+extern uint sceneWidth, sceneHeight;
 Graphics::Surface freezeSurface;
 
 void shufflePeople();

engines/sludge/graphics.cpp

@@ -33,7 +33,7 @@
 
 namespace Sludge {
 
-unsigned int winWidth, winHeight;
+uint winWidth, winHeight;
 int viewportHeight, viewportWidth;
 int viewportOffsetX = 0, viewportOffsetY = 0;
 
@@ -45,7 +45,7 @@ extern int specialSettings;
 
 void setMovieViewport();
 
-extern unsigned int sceneWidth, sceneHeight;
+extern uint sceneWidth, sceneHeight;
 extern zBufferData zBuffer;
 extern int lightMapNumber;
 

engines/sludge/graphics.h

@@ -26,7 +26,7 @@
 
 namespace Sludge {
 
-extern unsigned int winWidth, winHeight;
+extern uint winWidth, winHeight;
 extern int viewportHeight, viewportWidth;
 extern int viewportOffsetX, viewportOffsetY;
 extern int realWinWidth, realWinHeight;

engines/sludge/language.cpp

@@ -36,7 +36,7 @@ int *languageTable;
 char **languageName;
 settingsStruct gameSettings;
 
-unsigned int stringToInt(char *s) {
+uint stringToInt(char *s) {
 	int i = 0;
 	bool negative = false;
 	for (;;) {
@@ -103,7 +103,7 @@ void readIniFile(const char *filename) {
 
 	char lineSoFar[257] = "";
 	char secondSoFar[257] = "";
-	unsigned char here = 0;
+	byte here = 0;
 	char readChar = ' ';
 	bool keepGoing = true;
 	bool doingSecond = false;
@@ -186,7 +186,7 @@ void makeLanguageTable(Common::File *table) {
 	if (!checkNew(languageName))
 		return;
 
-	for (unsigned int i = 0; i <= gameSettings.numLanguages; i++) {
+	for (uint i = 0; i <= gameSettings.numLanguages; i++) {
 		languageTable[i] = i ? table->readUint16BE() : 0;
 		debug(kSludgeDebugDataLoad, "languageTable %i: %i", i, languageTable[i]);
 		languageName[i] = 0;
@@ -202,7 +202,7 @@ void makeLanguageTable(Common::File *table) {
 int getLanguageForFileB() {
 	int indexNum = -1;
 
-	for (unsigned int i = 0; i <= gameSettings.numLanguages; i++) {
+	for (uint i = 0; i <= gameSettings.numLanguages; i++) {
 		if (languageTable[i] == gameSettings.languageID)
 			indexNum = i;
 	}