From d83a83ef5021c1e329127d3c6402088aeb1c1dd1 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Tue, 29 Mar 2011 21:55:21 +0200
Subject: JANITORIAL: Remove/comment unused vars

Found by GCC 4.6's -Wunused-but-set-variable
---
 engines/cruise/backgroundIncrust.cpp |  6 +-----
 engines/cruise/cruise_main.cpp       | 11 -----------
 engines/cruise/dataLoader.cpp        |  4 ++--
 engines/cruise/linker.cpp            |  4 ----
 engines/cruise/mainDraw.cpp          |  4 ----
 5 files changed, 3 insertions(+), 26 deletions(-)

(limited to 'engines/cruise')

diff --git a/engines/cruise/backgroundIncrust.cpp b/engines/cruise/backgroundIncrust.cpp
index 6bd8b270e0..b51e86296c 100644
--- a/engines/cruise/backgroundIncrust.cpp
+++ b/engines/cruise/backgroundIncrust.cpp
@@ -198,17 +198,13 @@ void regenerateBackgroundIncrust(backgroundIncrustStruct *pHead) {
 	while (pl) {
 		backgroundIncrustStruct* pl2 = pl->next;
 
-		bool bLoad = false;
 		int frame = pl->frame;
 		//int screen = pl->backgroundIdx;
 
 		if ((filesDatabase[frame].subData.ptr == NULL) || (strcmp(pl->name, filesDatabase[frame].subData.name))) {
 			frame = NUM_FILE_ENTRIES - 1;
-			if (loadFile(pl->name, frame, pl->spriteId) >= 0) {
-				bLoad = true;
-			} else {
+			if (!loadFile(pl->name, frame, pl->spriteId) >= 0)
 				frame = -1;
-			}
 		}
 
 		if (frame >= 0) {
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 99de66deb6..b1d7a594fe 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -1004,18 +1004,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) {
 					if (!obj2Ovl)  obj2Ovl = j;
 
 					char verbe_name[80];
-					char obj1_name[80];
-					char obj2_name[80];
-					char r_verbe_name[80];
-					char r_obj1_name[80];
-					char r_obj2_name[80];
-
 					verbe_name[0]	= 0;
-					obj1_name[0]	= 0;
-					obj2_name[0]	= 0;
-					r_verbe_name[0] = 0;
-					r_obj1_name[0]	= 0;
-					r_obj2_name[0]	= 0;
 
 					ovlDataStruct *ovl2 = NULL;
 					ovlDataStruct *ovl3 = NULL;
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 03a2117f07..b9e4ca8bc9 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -358,7 +358,7 @@ int loadFNTSub(uint8 *ptr, int destIdx) {
 	uint8 *ptr2 = ptr;
 	uint8 *destPtr;
 	int fileIndex;
-	uint32 fontSize;
+	//uint32 fontSize;
 
 	ptr2 += 4;
 	loadFileVar1 = READ_BE_UINT32(ptr2);
@@ -373,7 +373,7 @@ int loadFNTSub(uint8 *ptr, int destIdx) {
 
 	memcpy(destPtr, ptr2, loadFileVar1);
 
-	fontSize = READ_BE_UINT32(ptr2);
+	//fontSize = READ_BE_UINT32(ptr2);
 
 	if (destPtr != NULL) {
 		int32 i;
diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp
index 49e97ebc11..afc7992493 100644
--- a/engines/cruise/linker.cpp
+++ b/engines/cruise/linker.cpp
@@ -147,8 +147,6 @@ int updateScriptImport(int ovlIdx) {
 				const char *ptrImportName;
 				uint8 *ptrData;
 
-				int var_22 = 0;
-
 				if (param == 0) {
 					pScript = getOvlData3Entry(ovlIdx, i);
 				} else {
@@ -159,8 +157,6 @@ int updateScriptImport(int ovlIdx) {
 				ptrImportName = (const char*)(pScript->dataPtr + pScript->offsetToImportName);	// import name
 				ptrData = pScript->dataPtr;
 
-				var_22 = 0;
-
 				if (pScript->numRelocGlob > 0) {
 					int counter = pScript->numRelocGlob;
 
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index aaa6f987b6..f6b04e6d9d 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -1081,8 +1081,6 @@ void mainDrawPolygons(int fileIndex, cellStruct *plWork, int X, int scale, int Y
 	int newScale;
 	char *newFrame;
 
-	int var_8;		// unused
-
 	int sizeTable[4];	// 0 = left, 1 = right, 2 = bottom, 3 = top
 
 	// this function checks if the dataPtr is not 0, else it retrives the data for X, Y, scale and DataPtr again (OLD: mainDrawSub1Sub1)
@@ -1125,8 +1123,6 @@ void mainDrawPolygons(int fileIndex, cellStruct *plWork, int X, int scale, int Y
 
 	gfxModuleData_addDirtyRect(Common::Rect(spriteX2, spriteY2, spriteX1, spriteY1));
 
-	var_8 = 0;
-
 	memset(polygonMask, 0xFF, (320*200) / 8);
 
 	int numPasses = 0;
-- 
cgit v1.2.3