[Scummvm-cvs-logs] scummvm master -> 1a4d723e6099fe06055b46d7fa9f07e7158d271b

dreammaster dreammaster at scummvm.org
Sat Jun 13 02:24:32 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:
1a4d723e60 SHERLOCK: RT: Refactor and remove remaining uses of MAX_NPC


Commit: 1a4d723e6099fe06055b46d7fa9f07e7158d271b
    https://github.com/scummvm/scummvm/commit/1a4d723e6099fe06055b46d7fa9f07e7158d271b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-12T20:23:41-04:00

Commit Message:
SHERLOCK: RT: Refactor and remove remaining uses of MAX_NPC

Changed paths:
    engines/sherlock/people.h
    engines/sherlock/tattoo/tattoo_scene.cpp



diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h
index d9cb8de..09022b1 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 a896fbe..5ebf38b 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);






More information about the Scummvm-git-logs mailing list