diff options
| author | Filippos Karapetis | 2008-07-07 19:40:43 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-07-07 19:40:43 +0000 |
| commit | 741214b6568abc10992701cc284569c318181e93 (patch) | |
| tree | f9444ecc1a39e3f4171d0035f111ffb00e8e6e94 /engines/m4 | |
| parent | 0f8f3d51bba952632eb5ee5926cad8814cd19c74 (diff) | |
| download | scummvm-rg350-741214b6568abc10992701cc284569c318181e93.tar.gz scummvm-rg350-741214b6568abc10992701cc284569c318181e93.tar.bz2 scummvm-rg350-741214b6568abc10992701cc284569c318181e93.zip | |
Some fixes for warnings under GCC 2.95
svn-id: r32948
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/globals.cpp | 10 | ||||
| -rw-r--r-- | engines/m4/globals.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/m4/globals.cpp b/engines/m4/globals.cpp index 12d9a24d37..58c68979d1 100644 --- a/engines/m4/globals.cpp +++ b/engines/m4/globals.cpp @@ -75,7 +75,7 @@ bool Kernel::sendTrigger(int32 triggerNum) { bool Kernel::handleTrigger(int32 triggerNum) { - printf("betweenRooms = %d; triggerNum = %08X\n", betweenRooms, triggerNum); + printf("betweenRooms = %d; triggerNum = %08X\n", betweenRooms, (uint)triggerNum); if (betweenRooms) return true; @@ -271,11 +271,13 @@ Globals::Globals(M4Engine *vm): _vm(vm) { } Globals::~Globals() { - for(uint32 i = 0; i < _madsVocab.size(); i++) + uint32 i; + + for(i = 0; i < _madsVocab.size(); i++) free(_madsVocab[i]); _madsVocab.clear(); - for(uint32 i = 0; i < _madsQuotes.size(); i++) + for(i = 0; i < _madsQuotes.size(); i++) free(_madsQuotes[i]); _madsQuotes.clear(); @@ -351,7 +353,7 @@ void Globals::loadMadsMessagesInfo() { _vm->res()->toss("messages.dat"); } -char* Globals::loadMessage(uint32 index) { +char* Globals::loadMessage(uint index) { if (index > _madsMessages.size() - 1) { warning("Invalid message index: %i", index); return NULL; diff --git a/engines/m4/globals.h b/engines/m4/globals.h index a0133db2d6..a80e8bf710 100644 --- a/engines/m4/globals.h +++ b/engines/m4/globals.h @@ -177,7 +177,7 @@ public: void loadMadsMessagesInfo(); uint32 getMessagesSize() { return _madsMessages.size(); } - char* loadMessage(uint32 index); + char* loadMessage(uint index); }; #define PLAYER_FIELD_LENGTH 40 |