[Scummvm-cvs-logs] SF.net SVN: scummvm: [26617] scummvm/trunk/engines/cruise
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Apr 27 21:54:15 CEST 2007
Revision: 26617
http://scummvm.svn.sourceforge.net/scummvm/?rev=26617&view=rev
Author: fingolfin
Date: 2007-04-27 12:54:14 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Fixing lots of warnings
Modified Paths:
--------------
scummvm/trunk/engines/cruise/actor.cpp
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/cruise_main.h
scummvm/trunk/engines/cruise/font.cpp
scummvm/trunk/engines/cruise/function.cpp
scummvm/trunk/engines/cruise/linker.cpp
scummvm/trunk/engines/cruise/mainDraw.cpp
scummvm/trunk/engines/cruise/menu.cpp
scummvm/trunk/engines/cruise/menu.h
Modified: scummvm/trunk/engines/cruise/actor.cpp
===================================================================
--- scummvm/trunk/engines/cruise/actor.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/actor.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -442,7 +442,7 @@
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;
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -346,7 +346,7 @@
}
}
-void printInfoBlackBox(char* string)
+void printInfoBlackBox(const char* string)
{
}
@@ -728,7 +728,6 @@
if((var_4 != var_16) && (var_2 != var_14))
{
- params;
getMultipleObjectParam(var_16, var_14, ¶ms);
var_C = params.X;
@@ -1111,7 +1110,7 @@
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)
{
Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/cruise_main.h 2007-04-27 19:54:14 UTC (rev 26617)
@@ -76,7 +76,7 @@
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);
Modified: scummvm/trunk/engines/cruise/font.cpp
===================================================================
--- scummvm/trunk/engines/cruise/font.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/font.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -507,7 +507,7 @@
{
character = *(string++);
- short int data = fontCharacterTable[character];
+ short int data = fontCharacterTable[(int)character];
if(character)
{
@@ -700,7 +700,7 @@
{
character = *(string++);
- short int charData = fontCharacterTable[character]; // get character position
+ short int charData = fontCharacterTable[(int)character]; // get character position
if(character)
{
Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/function.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -984,7 +984,7 @@
(pCurrent->X == var_4) &&
(pCurrent->Y == var_6))
{
- pCurrent->field_6 = -1;
+ pCurrent->field_6 = (uint16)-1;
}
pCurrent = pCurrent->next;
@@ -995,7 +995,7 @@
while(pCurrent)
{
- if(pCurrent->field_6 == -1)
+ if(pCurrent->field_6 == (uint16)-1)
{
backgroundIncrustStruct* pNext = pCurrent->next;
backgroundIncrustStruct* bx = pCurrentHead;
Modified: scummvm/trunk/engines/cruise/linker.cpp
===================================================================
--- scummvm/trunk/engines/cruise/linker.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/linker.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -269,7 +269,6 @@
for(i=0;i<numImport2;i++)
{
- char buffer[256];
int out1;
int foundExportIdx;
exportEntryStruct* pFoundExport;
Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -128,7 +128,7 @@
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)
{
Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/menu.cpp 2007-04-27 19:54:14 UTC (rev 26617)
@@ -28,7 +28,7 @@
menuStruct* menuTable[8];
-menuStruct* createMenu(int X, int Y, char* menuName)
+menuStruct* createMenu(int X, int Y, const char* menuName)
{
menuStruct* entry;
Modified: scummvm/trunk/engines/cruise/menu.h
===================================================================
--- scummvm/trunk/engines/cruise/menu.h 2007-04-27 19:50:45 UTC (rev 26616)
+++ scummvm/trunk/engines/cruise/menu.h 2007-04-27 19:54:14 UTC (rev 26617)
@@ -26,7 +26,7 @@
struct menuStruct
{
- char* stringPtr;
+ const char* stringPtr;
gfxEntryStruct* gfx;
int x;
int y;
@@ -38,7 +38,7 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list