aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/sherlock/people.h1
-rw-r--r--engines/sherlock/tattoo/tattoo_scene.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index d9cb8de393..09022b10c8 100644
--- a/engines/sherlock/people.h
+++ b/engines/sherlock/people.h
@@ -32,7 +32,6 @@ namespace Sherlock {
enum PeopleId {
PLAYER = 0,
- MAX_NPC = 5,
MAX_NPC_PATH = 200
};
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index a896fbea34..5ebf38b922 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -820,8 +820,8 @@ void TattooScene::setNPCPath(int npc) {
return;
// Turn off all the NPCs, since the talk script will turn them back on as needed
- for (uint idx = 0; idx < MAX_NPC; ++idx)
- people[idx + 1]._type = INVALID;
+ for (uint idx = 1; idx < MAX_CHARACTERS; ++idx)
+ people[idx]._type = INVALID;
// Call the path script for the scene
Common::String pathFile = Common::String::format("PATH%.2dA", _currentScene);