Fixing lots of warnings

svn-id: r26617

9 files changed, 12 insertions, 14 deletions

diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 1cedb816e0..4c38fa9492 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -442,7 +442,7 @@ void	explore( int depart, int arrivee )
 				D=0;
 				for ( i=0; i < idsol; i++ )
 				{
-					D = D+ctp_routeCoords[sol[i]][sol[i+1]];
+					D = D+ctp_routeCoords[(int)sol[i]][(int)sol[i+1]];
 					Fsol[i]=sol[i];
 				}
 				prem2=0;
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 99205b5bab..a0dafea669 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -346,7 +346,7 @@ uint8* getDataFromData3(ovlData3Struct* ptr, int param)
   }
 }
 
-void printInfoBlackBox(char* string)
+void printInfoBlackBox(const char* string)
 {
 }
 
@@ -728,7 +728,6 @@ int getCursorFromObject(int mouseX, int mouseY, int* outX, int* outY)
 
               if((var_4 != var_16) && (var_2 != var_14))
               {
-                params;
                 getMultipleObjectParam(var_16, var_14, &params);
 
                 var_C = params.X;
@@ -1111,7 +1110,7 @@ int callInventoryObject(int param0, int param1, int x, int y)
 
                   if(var_22)
                   {
-                    if(var_34->varNameOffset>=0)
+                    if(true /*var_34->varNameOffset>=0*/) // FIXME: This check is always true since varNameOffset is unsigned
                     {
                       if(var_22->specialString1)
                       {
diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h
index 0ca40229dc..2512e71eab 100644
--- a/engines/cruise/cruise_main.h
+++ b/engines/cruise/cruise_main.h
@@ -76,7 +76,7 @@ void resetFileEntry(int32 entryNumber);
 void saveShort(void* ptr, int16 var);
 void* mallocAndZero(int32 size);
 uint8* mainProc14(uint16 overlay, uint16 idx);
-void printInfoBlackBox(char* string);
+void printInfoBlackBox(const char* string);
 void waitForPlayerInput(void);
 int loadCtp(uint8* ctpName);
 void loadPakedFileToMem(int fileIdx, uint8* buffer);
diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index 37c3e8c2b3..5792f3f9ef 100644
--- a/engines/cruise/font.cpp
+++ b/engines/cruise/font.cpp
@@ -507,7 +507,7 @@ void drawString(int32 x, int32 y, uint8* string, uint8* buffer, uint8 color, int
 		{
 			character = *(string++);
 
-			short int data = fontCharacterTable[character];
+			short int data = fontCharacterTable[(int)character];
 
 			if(character)
 			{
@@ -700,7 +700,7 @@ gfxEntryStruct* renderText(int inRightBorder_X, uint8* string)
 		{
 			character = *(string++);
 
-			short int charData = fontCharacterTable[character];     // get character position
+			short int charData = fontCharacterTable[(int)character];     // get character position
 
 			if(character)
 			{
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index c1c3ca58ec..e35b680f26 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -984,7 +984,7 @@ void removeBackgroundIncrust(int overlay, int idx, backgroundIncrustStruct* pHea
         (pCurrent->X == var_4) &&
         (pCurrent->Y == var_6))
     {
-      pCurrent->field_6 = -1;
+      pCurrent->field_6 = (uint16)-1;
     }
 
     pCurrent = pCurrent->next;
@@ -995,7 +995,7 @@ void removeBackgroundIncrust(int overlay, int idx, backgroundIncrustStruct* pHea
 
   while(pCurrent)
   {
-    if(pCurrent->field_6 == -1)
+    if(pCurrent->field_6 == (uint16)-1)
     {
       backgroundIncrustStruct* pNext = pCurrent->next;
       backgroundIncrustStruct* bx = pCurrentHead;
diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp
index 7e10f4633c..465248f606 100644
--- a/engines/cruise/linker.cpp
+++ b/engines/cruise/linker.cpp
@@ -269,7 +269,6 @@ int updateScriptImport(int ovlIdx)
 
     for(i=0;i<numImport2;i++)
     {
-      char buffer[256];
       int out1;
       int foundExportIdx;
       exportEntryStruct* pFoundExport;
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index 7e938bdb96..d90bff9b64 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -128,7 +128,7 @@ void getPolyData(int fileIndex, int X, int Y, int *outScale, int *outY, int *out
 
 		newFileIndex += fileIndex;
 
-		if(newFileIndex >= 0)
+		if(true /*newFileIndex >= 0*/)	// FIXME: comparison is always true due to limited range of data type
 		{
 			if(filesDatabase[newFileIndex].resType == 0 && filesDatabase[newFileIndex].subData.ptr)
 			{
diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp
index 7d16459b1b..f30775dd18 100644
--- a/engines/cruise/menu.cpp
+++ b/engines/cruise/menu.cpp
@@ -28,7 +28,7 @@ namespace Cruise {
 
 menuStruct* menuTable[8];
 
-menuStruct* createMenu(int X, int Y, char* menuName)
+menuStruct* createMenu(int X, int Y, const char* menuName)
 {
   menuStruct* entry;
 
diff --git a/engines/cruise/menu.h b/engines/cruise/menu.h
index df49304b20..5cc983ba67 100644
--- a/engines/cruise/menu.h
+++ b/engines/cruise/menu.h
@@ -26,7 +26,7 @@ namespace Cruise {
 
 struct menuStruct
 {
-  char* stringPtr;
+  const char* stringPtr;
   gfxEntryStruct* gfx;
   int x;
   int y;
@@ -38,7 +38,7 @@ typedef struct menuStruct menuStruct;
 
 extern menuStruct* menuTable[8];
 
-menuStruct* createMenu(int X, int Y, char* menuName);
+menuStruct* createMenu(int X, int Y, const char* menuName);
 void addSelectableMenuEntry(int var0, int var1, menuStruct* pMenu, int var2, int color, char* menuText);
 void updateMenuMouse(int mouseX, int mouseY, menuStruct* pMenu);
 int processMenu(menuStruct* pMenu);