[Scummvm-cvs-logs] SF.net SVN: scummvm: [32948] scummvm/trunk/engines/m4
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Jul 7 21:40:44 CEST 2008
Revision: 32948
http://scummvm.svn.sourceforge.net/scummvm/?rev=32948&view=rev
Author: thebluegr
Date: 2008-07-07 12:40:43 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
Some fixes for warnings under GCC 2.95
Modified Paths:
--------------
scummvm/trunk/engines/m4/globals.cpp
scummvm/trunk/engines/m4/globals.h
Modified: scummvm/trunk/engines/m4/globals.cpp
===================================================================
--- scummvm/trunk/engines/m4/globals.cpp 2008-07-07 18:42:57 UTC (rev 32947)
+++ scummvm/trunk/engines/m4/globals.cpp 2008-07-07 19:40:43 UTC (rev 32948)
@@ -75,7 +75,7 @@
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() {
- 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 @@
_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;
Modified: scummvm/trunk/engines/m4/globals.h
===================================================================
--- scummvm/trunk/engines/m4/globals.h 2008-07-07 18:42:57 UTC (rev 32947)
+++ scummvm/trunk/engines/m4/globals.h 2008-07-07 19:40:43 UTC (rev 32948)
@@ -177,7 +177,7 @@
void loadMadsMessagesInfo();
uint32 getMessagesSize() { return _madsMessages.size(); }
- char* loadMessage(uint32 index);
+ char* loadMessage(uint index);
};
#define PLAYER_FIELD_LENGTH 40
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