diff options
| author | Paul Gilbert | 2012-05-04 22:39:30 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-05-04 22:39:30 +1000 |
| commit | 9c2ccc4f9c0f4e27209ac876bf2112fd2a6e2987 (patch) | |
| tree | 791fde6e4066a6f941435205e24124938d5aada9 /engines | |
| parent | 23cd3b7730c292539649578d1aea373812e6b4ce (diff) | |
| download | scummvm-rg350-9c2ccc4f9c0f4e27209ac876bf2112fd2a6e2987.tar.gz scummvm-rg350-9c2ccc4f9c0f4e27209ac876bf2112fd2a6e2987.tar.bz2 scummvm-rg350-9c2ccc4f9c0f4e27209ac876bf2112fd2a6e2987.zip | |
TONY: Further bugfixes for gcc warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tony/mpal/mpal.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index d767dbe381..55d70b2e18 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -97,7 +97,6 @@ typedef LPCFCALL* LPLPCFCALL; uint32 mpalError; -static bool bInit=false; static byte * lpMpcImage; LPITEMIRQFUNCTION lpiifCustom=NULL; @@ -786,11 +785,11 @@ static LPITEM GetItemData(uint32 nOrdItem) { patlength = dat; dat+=ret->numpattern; - for (i=1;i<ret->numpattern;i++) { - for (j=0;j<patlength[i];j++) - ret->pattern[i][j]=dat[j]; - ret->pattern[i][patlength[i]]=255; // Termina i pattern - dat+=patlength[i]; + for (i = 1; i < ret->numpattern; i++) { + for (j = 0; j < patlength[i]; j++) + ret->pattern[i][j] = dat[j]; + ret->pattern[i][(int)patlength[i]] = 255; // Termina i pattern + dat += patlength[i]; } // Carica i singoli frame di animazione @@ -2284,9 +2283,9 @@ bool bDontOutput; struct MsgCommentsStruct { uint16 wStart; uint16 wEnd; - char *pComment; + const char *pComment; }; -MsgCommentsStruct MsgComments[] = { +const MsgCommentsStruct MsgComments[] = { { 10, 16, "###" }, { 560, 563, "@@@ BUTCH & DUDLEY:" }, { 551, 553, "@@@ JACK'S LETTER (JACK'S VOICE):" }, @@ -2894,7 +2893,7 @@ const char *DLG600[] = { "Tony", "Jack", "Jack", NULL, "Jack", NULL, NULL, NULL, #define HANDLE_DIALOG(num) \ case num: \ - if (nPers >= sizeof(DLG##num) / sizeof(char*) || DLG##num[nPers]==NULL) \ + if (nPers >= (int)(sizeof(DLG##num) / sizeof(const char *)) || DLG##num[nPers] == NULL) \ { \ warning("ERROR: Il personaggio #%d non esiste nel dialogo %d!\n", nPers, nDlg); \ return "ERROR"; \ |