[Scummvm-cvs-logs] scummvm master -> 676f0e01d17d70415c3f92ffe17a6cb251b50425
dreammaster
dreammaster at scummvm.org
Sun Oct 4 03:13:08 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:
676f0e01d1 SHERLOCK: SS: Fix hiding Holmes when viewing lab table
Commit: 676f0e01d17d70415c3f92ffe17a6cb251b50425
https://github.com/scummvm/scummvm/commit/676f0e01d17d70415c3f92ffe17a6cb251b50425
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-03T21:12:45-04:00
Commit Message:
SHERLOCK: SS: Fix hiding Holmes when viewing lab table
Changed paths:
engines/sherlock/people.cpp
engines/sherlock/talk.cpp
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index b1f4abb..09dba25 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -184,7 +184,7 @@ void People::reset() {
Person &p = *_data[idx];
if (IS_SERRATED_SCALPEL) {
- p._type = CHARACTER;
+ p._type = _holmesOn ? CHARACTER : HIDDEN;
p._position = Point32(100 * FIXED_INT_MULTIPLIER, 110 * FIXED_INT_MULTIPLIER);
} else if (!talk._scriptMoreFlag && !saves._justLoaded) {
p._type = (idx == 0) ? CHARACTER : INVALID;
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index 9509050..416f04f 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1023,6 +1023,7 @@ OpcodeReturn Talk::cmdEndTextWindow(const byte *&str) {
OpcodeReturn Talk::cmdHolmesOff(const byte *&str) {
People &people = *_vm->_people;
people[HOLMES]._type = REMOVE;
+ people._holmesOn = false;
return RET_SUCCESS;
}
@@ -1030,6 +1031,7 @@ OpcodeReturn Talk::cmdHolmesOff(const byte *&str) {
OpcodeReturn Talk::cmdHolmesOn(const byte *&str) {
People &people = *_vm->_people;
people[HOLMES]._type = CHARACTER;
+ people._holmesOn = true;
return RET_SUCCESS;
}
More information about the Scummvm-git-logs
mailing list