aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorstrangerke2011-04-13 21:59:54 +0200
committerstrangerke2011-04-13 21:59:54 +0200
commit4e75a95f863d588892a5112243b7baebc7b86ff3 (patch)
tree9ea53c311514d635ddc070cae87d0acc6d63f239 /engines
parent66b43f2312578f35e0718d0699de207a7bf77f1a (diff)
downloadscummvm-rg350-4e75a95f863d588892a5112243b7baebc7b86ff3.tar.gz
scummvm-rg350-4e75a95f863d588892a5112243b7baebc7b86ff3.tar.bz2
scummvm-rg350-4e75a95f863d588892a5112243b7baebc7b86ff3.zip
TSAGE: Fix two GCC warnings (which were bugs). Thanks LordHoto for reporting those.
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/converse.cpp8
-rw-r--r--engines/tsage/resources.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index fd1dfe9e9d..83989879dc 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 1af1bb8d2f..886f1171bb 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);
};