[Scummvm-cvs-logs] scummvm master -> 4e75a95f863d588892a5112243b7baebc7b86ff3

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4e75a95f86 TSAGE: Fix two GCC warnings (which were bugs). Thanks LordHoto for reporting those.


Commit: 4e75a95f863d588892a5112243b7baebc7b86ff3
    https://github.com/scummvm/scummvm/commit/4e75a95f863d588892a5112243b7baebc7b86ff3
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-13T12:59:54-07:00

Commit Message:
TSAGE: Fix two GCC warnings (which were bugs). Thanks LordHoto for reporting those.

Changed paths:
    engines/tsage/converse.cpp
    engines/tsage/resources.h



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index fd1dfe9..8398987 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -512,10 +512,10 @@ void Obj44::load(const byte *dataP) {
 
 void Obj44::synchronise(Serialiser &s) {
 	s.syncAsSint32LE(_id);
-	for (int i = 0; i < OBJ44_LIST_SIZE; ++i)
-		s.syncAsSint32LE(_field2[i]);
-	for (int i = 0; i < OBJ44_LIST_SIZE; ++i)
-		_list[OBJ44_LIST_SIZE].synchronise(s);
+	for (int idx = 0; idx < OBJ44_LIST_SIZE; ++idx)
+		s.syncAsSint32LE(_field2[idx]);
+	for (int idx = 0; idx < OBJ44_LIST_SIZE; ++idx)
+		_list[idx].synchronise(s);
 	s.syncAsUint32LE(_speakerOffset);
 }
 
diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h
index 1af1bb8..886f117 100644
--- a/engines/tsage/resources.h
+++ b/engines/tsage/resources.h
@@ -127,7 +127,7 @@ public:
 	byte *lock(uint32 handle);
 	int indexOf(const byte *p);
 	void deallocate(const byte *p);
-	void deallocate(uint16 handle) { assert("TODO"); }
+	void deallocate(uint16 handle) { error("TODO: MemoryManager::deallocate(handle)"); }
 	uint32 getSize(const byte *p);
 	void incLocks(const byte *p);
 };