From 6bc2a633a2921d589f8226160d19243a9ee99699 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 7 Jul 2015 08:19:39 -0400 Subject: SHERLOCK: RT: Fix Valgrind issues --- engines/sherlock/people.cpp | 4 ++-- engines/sherlock/tattoo/tattoo_people.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines') 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); -- cgit v1.2.3