[Scummvm-cvs-logs] scummvm master -> 31235218ea5d0bfb2f6f620253024bdeb93e2130

dreammaster dreammaster at scummvm.org
Fri Aug 28 02:35:59 CEST 2015


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:
31235218ea SHERLOCK: RT: Reset _npcIndex when loading savegame


Commit: 31235218ea5d0bfb2f6f620253024bdeb93e2130
    https://github.com/scummvm/scummvm/commit/31235218ea5d0bfb2f6f620253024bdeb93e2130
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-27T20:34:34-04:00

Commit Message:
SHERLOCK: RT: Reset _npcIndex when loading savegame

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index bd2ed0e..b3f02f4 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -995,6 +995,8 @@ void TattooPerson::synchronize(Serializer &s) {
 	s.syncAsSint32LE(_npcPause);
 	s.syncAsByte(_lookHolmes);
 	s.syncAsByte(_updateNPCPath);
+	if (s.isLoading())
+		_npcIndex = 0;
 
 	// Verbs
 	for (int idx = 0; idx < 2; ++idx)






More information about the Scummvm-git-logs mailing list