aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-07 08:19:39 -0400
committerPaul Gilbert2015-07-07 08:19:39 -0400
commit6bc2a633a2921d589f8226160d19243a9ee99699 (patch)
tree670c151257b42d85ec9a542eda6fd719ce2258d1 /engines
parentada51dbdfb3111f309732e17abcbcc4fd1034fdc (diff)
downloadscummvm-rg350-6bc2a633a2921d589f8226160d19243a9ee99699.tar.gz
scummvm-rg350-6bc2a633a2921d589f8226160d19243a9ee99699.tar.bz2
scummvm-rg350-6bc2a633a2921d589f8226160d19243a9ee99699.zip
SHERLOCK: RT: Fix Valgrind issues
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/people.cpp4
-rw-r--r--engines/sherlock/tattoo/tattoo_people.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 46ae8e7051..1e19dccb32 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -185,11 +185,11 @@ void People::reset() {
if (IS_SERRATED_SCALPEL) {
p._type = CHARACTER;
- p._sequenceNumber = Tattoo::STOP_DOWNRIGHT;
+ p._sequenceNumber = (int)Tattoo::STOP_DOWNRIGHT;
p._position = Point32(100 * FIXED_INT_MULTIPLIER, 110 * FIXED_INT_MULTIPLIER);
} else if (!talk._scriptMoreFlag && !saves._justLoaded) {
p._type = (idx == 0) ? CHARACTER : INVALID;
- p._sequenceNumber = Scalpel::STOP_DOWNRIGHT;
+ p._sequenceNumber = (int)Scalpel::STOP_DOWNRIGHT;
p._position = Point32(36 * FIXED_INT_MULTIPLIER, 29 * FIXED_INT_MULTIPLIER);
p._use[0]._verb = "";
p._use[1]._verb = "";
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 81f68b46ae..d89a2e7a55 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -988,7 +988,7 @@ void TattooPerson::synchronize(Serializer &s) {
s.syncAsUint16LE(count);
if (s.isLoading()) {
// Load path
- for (uint idx = 0; idx < count; ++count) {
+ for (uint idx = 0; idx < count; ++idx) {
int xp = 0, yp = 0;
s.syncAsSint16LE(xp);
s.syncAsSint16LE(yp);