thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing lots of warnings

Browse source 
svn-id: r26617
This commit is contained in:
Max Horn 2007-04-27 19:54:14 +00:00
parent 4958b58622
commit b4e196e4fd
9 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/cruise/actor.cpp
View file

@ -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;

5
engines/cruise/cruise_main.cpp
View file

@ -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)
{

2
engines/cruise/cruise_main.h
View file

@ -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);

4
engines/cruise/font.cpp
View file

@ -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)
{

4
engines/cruise/function.cpp
View file

@ -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;

1
engines/cruise/linker.cpp
View file

@ -269,7 +269,6 @@ int updateScriptImport(int ovlIdx)
for(i=0;i<numImport2;i++)
{
char buffer[256];
int out1;
int foundExportIdx;
exportEntryStruct* pFoundExport;

2
engines/cruise/mainDraw.cpp
View file

@ -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)
{

2
engines/cruise/menu.cpp
View file

@ -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;

4
engines/cruise/menu.h
View file

@ -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);