[Scummvm-cvs-logs] scummvm master -> 0a3ecf0471ae5bb20e32c49af85f36dc1f492770

m-kiewitz m_kiewitz at users.sourceforge.net
Tue Oct 6 18:49:35 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:
0a3ecf0471 SHERLOCK: SS: multilingual people names support


Commit: 0a3ecf0471ae5bb20e32c49af85f36dc1f492770
    https://github.com/scummvm/scummvm/commit/0a3ecf0471ae5bb20e32c49af85f36dc1f492770
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-10-06T18:47:47+02:00

Commit Message:
SHERLOCK: SS: multilingual people names support

people names are now available in Spanish + German as well

Changed paths:
    engines/sherlock/scalpel/scalpel.cpp
    engines/sherlock/scalpel/scalpel_fixed_text.cpp
    engines/sherlock/scalpel/scalpel_fixed_text.h



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 17e60f5..b17f38b 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -102,78 +102,78 @@ static const byte MAP_SEQUENCES[3][MAX_FRAME] = {
 
 struct PeopleData {
 	const char *portrait;
-	const char *name;
+	int fixedTextId;
 	byte stillSequences[MAX_TALK_SEQUENCES];
 	byte talkSequences[MAX_TALK_SEQUENCES];
 };
 
 const PeopleData PEOPLE_DATA[MAX_PEOPLE] = {
-	{ "HOLM", "Sherlock Holmes", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "WATS", "Dr. Watson", { 6, 0, 0 }, { 5, 5, 6, 7, 8, 7, 8, 6, 0, 0 } },
-	{ "LEST", "Inspector Lestrade", { 4, 0, 0 }, { 2, 0, 0 } },
-	{ "CON1", "Constable O'Brien", { 2, 0, 0 }, { 1, 0, 0 } },
-	{ "CON2", "Constable Lewis", { 2, 0, 0 }, { 1, 0, 0 } },
-	{ "SHEI", "Sheila Parker", { 2, 0, 0 }, { 2, 3, 0, 0 } },
-	{ "HENR", "Henry Carruthers", { 3, 0, 0 }, { 3, 0, 0 } },
-	{ "LESL", "Lesley", { 9, 0, 0 }, { 1, 2, 3, 2, 1, 2, 3, 0, 0 } },
-	{ "USH1", "An Usher", { 13, 0, 0 }, { 13, 14, 0, 0 } },
-	{ "USH2", "An Usher", { 2, 0, 0 }, { 2, 0, 0 } },
-	{ "FRED", "Fredrick Epstein", { 4, 0, 0 }, { 1, 2, 3, 4, 3, 4, 3, 2, 0, 0 } },
-	{ "WORT", "Mrs. Worthington", { 9, 0, 0 }, { 8, 0, 0 } },
-	{ "COAC", "The Coach", { 2, 0, 0 }, { 1, 2, 3, 4, 5, 4, 3, 2, 0, 0 } },
-	{ "PLAY", "A Player", { 8, 0, 0 }, { 7, 8, 0, 0 } },
-	{ "WBOY", "Tim", { 13, 0, 0 }, { 12, 13, 0, 0 } },
-	{ "JAME", "James Sanders", { 6, 0, 0 }, { 3, 4, 0, 0 } },
-	{ "BELL", "Belle", { 1, 0, 0 }, { 4, 5, 0, 0 } },
-	{ "GIRL", "Cleaning Girl", { 20, 0, 0 }, { 14, 15, 16, 17, 18, 19, 20, 20, 20, 0, 0 } },
-	{ "EPST", "Fredrick Epstein", { 17, 0, 0 }, { 16, 17, 18, 18, 18, 17, 17, 0, 0 } },
-	{ "WIGG", "Wiggins", { 3, 0, 0 }, { 2, 3, 0, 0 } },
-	{ "PAUL", "Paul", { 2, 0, 0 }, { 1, 2, 0, 0 } },
-	{ "BART", "The Bartender", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "DIRT", "A Dirty Drunk", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "SHOU", "A Shouting Drunk", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "STAG", "A Staggering Drunk", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "BOUN", "The Bouncer", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "SAND", "James Sanders", { 6, 0, 0 }, { 5, 6, 0, 0 } },
-	{ "CORO", "The Coroner", { 6, 0, 0 }, { 4, 5, 0, 0 } },
-	{ "EQUE", "Reginald Snipes", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "GEOR", "George Blackwood", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "LARS", "Lars", { 7, 0, 0 }, { 5, 6, 0, 0 } },
-	{ "PARK", "Sheila Parker", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "CHEM", "The Chemist", { 8, 0, 0 }, { 8, 9, 0, 0 } },
-	{ "GREG", "Inspector Gregson", { 6, 0, 0 }, { 5, 6, 0, 0 } },
-	{ "LAWY", "Jacob Farthington", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "MYCR", "Mycroft", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "SHER", "Old Sherman", { 7, 0, 0 }, { 7, 8, 0, 0 } },
-	{ "CHMB", "Richard", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "BARM", "The Barman", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "DAND", "A Dandy Player", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "ROUG", "A Rough-looking Player", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "SPEC", "A Spectator", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "HUNT", "Robert Hunt", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "VIOL", "Violet", { 3, 0, 0 }, { 3, 4, 0, 0 } },
-	{ "PETT", "Pettigrew", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "APPL", "Augie", { 8, 0, 0 }, { 14, 15, 0, 0 } },
-	{ "ANNA", "Anna Carroway", { 16, 0, 0 }, { 3, 4, 5, 6, 0, 0 } },
-	{ "GUAR", "A Guard", { 1, 0, 0 }, { 4, 5, 6, 0, 0 } },
-	{ "ANTO", "Antonio Caruso", { 8, 0, 0 }, { 7, 8, 0, 0 } },
-	{ "TOBY", "Toby the Dog", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "KING", "Simon Kingsley", { 13, 0, 0 }, { 13, 14, 0, 0 } },
-	{ "ALFR", "Alfred", { 2, 0, 0 }, { 2, 3, 0, 0 } },
-	{ "LADY", "Lady Brumwell", { 1, 0, 0 }, { 3, 4, 0, 0 } },
-	{ "ROSA", "Madame Rosa", { 1, 0, 0 }, { 1, 30, 0, 0 } },
-	{ "LADB", "Lady Brumwell", { 1, 0, 0 }, { 3, 4, 0, 0 } },
-	{ "MOOR", "Joseph Moorehead", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "BEAL", "Mrs. Beale", { 5, 0, 0 }, { 14, 15, 16, 17, 18, 19, 20, 0, 0 } },
-	{ "LION", "Felix", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "HOLL", "Hollingston", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "CALL", "Constable Callaghan", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "JERE", "Sergeant Duncan", { 2, 0, 0 }, { 1, 1, 2, 2, 0, 0 } },
-	{ "LORD", "Lord Brumwell", { 1, 0, 0 }, { 9, 10, 0, 0 } },
-	{ "NIGE", "Nigel Jaimeson", { 1, 0, 0 }, { 1, 2, 0, 138, 3, 4, 0, 138, 0, 0 } },
-	{ "JONA", "Jonas", { 1, 0, 0 }, { 1, 8, 0, 0 } },
-	{ "DUGA", "Constable Dugan", { 1, 0, 0 }, { 1, 0, 0 } },
-	{ "INSP", "Inspector Lestrade", { 4, 0, 0 }, { 2, 0, 0 } }
+	{ "HOLM", kFixedText_People_SherlockHolmes, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "WATS", kFixedText_People_DrWatson, { 6, 0, 0 }, { 5, 5, 6, 7, 8, 7, 8, 6, 0, 0 } },
+	{ "LEST", kFixedText_People_InspectorLestrade, { 4, 0, 0 }, { 2, 0, 0 } },
+	{ "CON1", kFixedText_People_ConstableOBrien, { 2, 0, 0 }, { 1, 0, 0 } },
+	{ "CON2", kFixedText_People_ConstableLewis, { 2, 0, 0 }, { 1, 0, 0 } },
+	{ "SHEI", kFixedText_People_SheilaParker, { 2, 0, 0 }, { 2, 3, 0, 0 } },
+	{ "HENR", kFixedText_People_HenryCarruthers, { 3, 0, 0 }, { 3, 0, 0 } },
+	{ "LESL", kFixedText_People_Lesley, { 9, 0, 0 }, { 1, 2, 3, 2, 1, 2, 3, 0, 0 } },
+	{ "USH1", kFixedText_People_AnUsher, { 13, 0, 0 }, { 13, 14, 0, 0 } },
+	{ "USH2", kFixedText_People_AnUsher, { 2, 0, 0 }, { 2, 0, 0 } },
+	{ "FRED", kFixedText_People_FredrickEpstein, { 4, 0, 0 }, { 1, 2, 3, 4, 3, 4, 3, 2, 0, 0 } },
+	{ "WORT", kFixedText_People_MrsWorthington, { 9, 0, 0 }, { 8, 0, 0 } },
+	{ "COAC", kFixedText_People_TheCoach, { 2, 0, 0 }, { 1, 2, 3, 4, 5, 4, 3, 2, 0, 0 } },
+	{ "PLAY", kFixedText_People_APlayer, { 8, 0, 0 }, { 7, 8, 0, 0 } },
+	{ "WBOY", kFixedText_People_Tim, { 13, 0, 0 }, { 12, 13, 0, 0 } },
+	{ "JAME", kFixedText_People_JamesSanders, { 6, 0, 0 }, { 3, 4, 0, 0 } },
+	{ "BELL", kFixedText_People_Belle, { 1, 0, 0 }, { 4, 5, 0, 0 } },
+	{ "GIRL", kFixedText_People_CleaningGirl, { 20, 0, 0 }, { 14, 15, 16, 17, 18, 19, 20, 20, 20, 0, 0 } },
+	{ "EPST", kFixedText_People_FredrickEpstein, { 17, 0, 0 }, { 16, 17, 18, 18, 18, 17, 17, 0, 0 } },
+	{ "WIGG", kFixedText_People_Wiggins, { 3, 0, 0 }, { 2, 3, 0, 0 } },
+	{ "PAUL", kFixedText_People_Paul, { 2, 0, 0 }, { 1, 2, 0, 0 } },
+	{ "BART", kFixedText_People_TheBartender, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "DIRT", kFixedText_People_ADirtyDrunk, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "SHOU", kFixedText_People_AShoutingDrunk, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "STAG", kFixedText_People_AStaggeringDrunk, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "BOUN", kFixedText_People_TheBouncer, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "SAND", kFixedText_People_JamesSanders, { 6, 0, 0 }, { 5, 6, 0, 0 } },
+	{ "CORO", kFixedText_People_TheCoroner, { 6, 0, 0 }, { 4, 5, 0, 0 } },
+	{ "EQUE", kFixedText_People_ReginaldSnipes, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "GEOR", kFixedText_People_GeorgeBlackwood, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "LARS", kFixedText_People_Lars, { 7, 0, 0 }, { 5, 6, 0, 0 } },
+	{ "PARK", kFixedText_People_SheilaParker, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "CHEM", kFixedText_People_TheChemist, { 8, 0, 0 }, { 8, 9, 0, 0 } },
+	{ "GREG", kFixedText_People_InspectorGregson, { 6, 0, 0 }, { 5, 6, 0, 0 } },
+	{ "LAWY", kFixedText_People_JacobFarthington, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "MYCR", kFixedText_People_Mycroft, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "SHER", kFixedText_People_OldSherman, { 7, 0, 0 }, { 7, 8, 0, 0 } },
+	{ "CHMB", kFixedText_People_Richard, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "BARM", kFixedText_People_TheBarman, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "DAND", kFixedText_People_ADandyPlayer, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "ROUG", kFixedText_People_ARoughlookingPlayer, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "SPEC", kFixedText_People_ASpectator, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "HUNT", kFixedText_People_RobertHunt, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "VIOL", kFixedText_People_Violet, { 3, 0, 0 }, { 3, 4, 0, 0 } },
+	{ "PETT", kFixedText_People_Pettigrew, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "APPL", kFixedText_People_Augie, { 8, 0, 0 }, { 14, 15, 0, 0 } },
+	{ "ANNA", kFixedText_People_AnnaCarroway, { 16, 0, 0 }, { 3, 4, 5, 6, 0, 0 } },
+	{ "GUAR", kFixedText_People_AGuard, { 1, 0, 0 }, { 4, 5, 6, 0, 0 } },
+	{ "ANTO", kFixedText_People_AntonioCaruso, { 8, 0, 0 }, { 7, 8, 0, 0 } },
+	{ "TOBY", kFixedText_People_TobyTheDog, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "KING", kFixedText_People_SimonKingsley, { 13, 0, 0 }, { 13, 14, 0, 0 } },
+	{ "ALFR", kFixedText_People_Alfred, { 2, 0, 0 }, { 2, 3, 0, 0 } },
+	{ "LADY", kFixedText_People_LadyBrumwell, { 1, 0, 0 }, { 3, 4, 0, 0 } },
+	{ "ROSA", kFixedText_People_MadameRosa, { 1, 0, 0 }, { 1, 30, 0, 0 } },
+	{ "LADB", kFixedText_People_LadyBrumwell, { 1, 0, 0 }, { 3, 4, 0, 0 } },
+	{ "MOOR", kFixedText_People_JosephMoorehead, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "BEAL", kFixedText_People_MrsBeale, { 5, 0, 0 }, { 14, 15, 16, 17, 18, 19, 20, 0, 0 } },
+	{ "LION", kFixedText_People_Felix, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "HOLL", kFixedText_People_Hollingston, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "CALL", kFixedText_People_ConstableCallaghan, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "JERE", kFixedText_People_SergeantDuncan, { 2, 0, 0 }, { 1, 1, 2, 2, 0, 0 } },
+	{ "LORD", kFixedText_People_LordBrumwell, { 1, 0, 0 }, { 9, 10, 0, 0 } },
+	{ "NIGE", kFixedText_People_NigelJaimeson, { 1, 0, 0 }, { 1, 2, 0, 138, 3, 4, 0, 138, 0, 0 } },
+	{ "JONA", kFixedText_People_Jonas, { 1, 0, 0 }, { 1, 8, 0, 0 } },
+	{ "DUGA", kFixedText_People_ConstableDugan, { 1, 0, 0 }, { 1, 0, 0 } },
+	{ "INSP", kFixedText_People_InspectorLestrade, { 4, 0, 0 }, { 2, 0, 0 } }
 };
 
 uint INFO_BLACK;
@@ -295,9 +295,14 @@ void ScalpelEngine::initialize() {
 	loadInventory();
 
 	// Set up list of people
-	for (int idx = 0; idx < MAX_PEOPLE; ++idx)
-		_people->_characters.push_back(PersonData(PEOPLE_DATA[idx].name, PEOPLE_DATA[idx].portrait,
+	ScalpelFixedText &fixedText = *(ScalpelFixedText *)_fixedText;
+	const char *peopleNamePtr = nullptr;
+
+	for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
+		peopleNamePtr = fixedText.getText(PEOPLE_DATA[idx].fixedTextId);
+		_people->_characters.push_back(PersonData(peopleNamePtr, PEOPLE_DATA[idx].portrait,
 			PEOPLE_DATA[idx].stillSequences, PEOPLE_DATA[idx].talkSequences));
+	}
 
 	_animation->setPrologueNames(&PROLOGUE_NAMES[0], PROLOGUE_NAMES_COUNT);
 	_animation->setPrologueFrames(&PROLOGUE_FRAMES[0][0], 6, 9);
diff --git a/engines/sherlock/scalpel/scalpel_fixed_text.cpp b/engines/sherlock/scalpel/scalpel_fixed_text.cpp
index 63f84d6..80b2dad 100644
--- a/engines/sherlock/scalpel/scalpel_fixed_text.cpp
+++ b/engines/sherlock/scalpel/scalpel_fixed_text.cpp
@@ -68,11 +68,67 @@ static const char *const fixedTextEN[] = {
 	"Tarot Cards",
 	"An ornate key",
 	"A pawn ticket",
-	// SH2: Verbs
-	"Open",
-	"Look",
-	"Talk",
-	"Journal"
+	// SH1: People names
+	"Sherlock Holmes",
+	"Dr. Watson",
+	"Inspector Lestrade",
+	"Constable O'Brien",
+	"Constable Lewis",
+	"Sheila Parker",
+	"Henry Carruthers",
+	"Lesley",
+	"An Usher",
+	"Fredrick Epstein",
+	"Mrs. Worthington",
+	"The Coach",
+	"A Player",
+	"Tim",
+	"James Sanders",
+	"Belle",
+	"Cleaning Girl",
+	"Wiggins",
+	"Paul",
+	"The Bartender",
+	"A Dirty Drunk",
+	"A Shouting Drunk",
+	"A Staggering Drunk",
+	"The Bouncer",
+	"The Coroner",
+	"Reginald Snipes",
+	"George Blackwood",
+	"Lars",
+	"The Chemist",
+	"Inspector Gregson",
+	"Jacob Farthington",
+	"Mycroft",
+	"Old Sherman",
+	"Richard",
+	"The Barman",
+	"A Dandy Player",
+	"A Rough-looking Player",
+	"A Spectator",
+	"Robert Hunt",
+	"Violet",
+	"Pettigrew",
+	"Augie",
+	"Anna Carroway",
+	"A Guard",
+	"Antonio Caruso",
+	"Toby the Dog",
+	"Simon Kingsley",
+	"Alfred",
+	"Lady Brumwell",
+	"Madame Rosa",
+	"Joseph Moorehead",
+	"Mrs. Beale",
+	"Felix",
+	"Hollingston",
+	"Constable Callaghan",
+	"Sergeant Duncan",
+	"Lord Brumwell",
+	"Nigel Jaimeson",
+	"Jonas",
+	"Constable Dugan"
 };
 
 // sharp-s       : 0xE1 / octal 341
@@ -120,11 +176,67 @@ static const char *const fixedTextDE[] = {
 	"Ein Tarock-Kartenspiel", // [sic]
 	"Ein verzierter Schl\201ssel",
 	"Ein Pfandschein",
-	// SH2: Verbs
-	"\231ffne",
-	"Schau",
-	"Rede",
-	"Tagebuch"
+	// SH1: People names
+	"Sherlock Holmes",
+	"Dr. Watson",
+	"Inspektor Lestrade",
+	"Konstabler O'Brien",
+	"Konstabler Lewis",
+	"Sheila Parker",
+	"Henry Carruthers",
+	"Lesley",
+	"Platzanweiser",
+	"Fredrick Epstein",
+	"Mrs. Worthington",
+	"Der Trainer",
+	"Ein Spieler",
+	"Tim",
+	"James Sanders",
+	"Belle",
+	"Putzmädchen",
+	"Wiggins",
+	"Paul",
+	"Gastwirt",
+	"Schmutziger Betrunkener",
+	"Lallender Betrunkener",
+	"Torkelnder Betrunkener",
+	"The Bouncer",
+	"Der Leichenbeschauer",
+	"Reginald Snipes",
+	"George Blackwood",
+	"Lars",
+	"Apotheker",
+	"Inspektor Gregson",
+	"Jacob Farthington",
+	"Mycroft",
+	"Old Sherman",
+	"Richard",
+	"Barkeeper",
+	"Jock Mahoney",
+	"Nobby Charleton",
+	"Zuschauer",
+	"Robert Hunt",
+	"Violet",
+	"Pettigrew",
+	"Augie",
+	"Anna Carroway",
+	"Wache",
+	"Antonio Caruso",
+	"Toby the Dog",
+	"Simon Kingsley",
+	"Alfred",
+	"Lady Brumwell",
+	"Madame Rosa",
+	"Joseph Moorehead",
+	"Mrs. Beale",
+	"Felix",
+	"Hollingston",
+	"Konstabler Callaghan",
+	"Sergeant Duncan",
+	"Lord Brumwell",
+	"Nigel Jaimeson",
+	"Jonas",
+	"Konstabler Dugan"
 };
 
 // up-side down exclamation mark - 0xAD / octal 255
@@ -171,6 +283,67 @@ static const char *const fixedTextES[] = {
 	"Unas cartas de Tarot",
 	"Una llave muy vistosa",
 	"Una papeleta de empe\244o",
+	// SH1: People names
+	"Sherlock Holmes",
+	"Dr. Watson",
+	"El inspector Lestrade",
+	"El agente O'Brien",
+	"El agente Lewis",
+	"Sheila Parker",
+	"Henry Carruthers",
+	"Lesley",
+	"Un ujier",
+	"Fredrick Epstein",
+	"Mrs. Worthington",
+	"El entrenador",
+	"El jugador",
+	"Tim",
+	"James Sanders",
+	"Belle",
+	"La chica de la limpieza",
+	"Wiggins",
+	"Paul",
+	"El barman",
+	"Un sucio borracho",
+	"Un borracho griton",
+	"Un tambaleante borracho",
+	"El gorila",
+	"El forense",
+	"Reginald Snipes",
+	"George Blackwood",
+	"Lars",
+	"El quimico",
+	"El inspector Gregson",
+	"Jacob Farthington",
+	"Mycroft",
+	"Old Sherman",
+	"Richard",
+	"El barman",
+	"Un jugador dandy",
+	"Un duro jugador",
+	"Un espectador",
+	"Robert Hunt",
+	"Violeta",
+	"Pettigrew",
+	"Augie",
+	"Anna Carroway",
+	"Un guarda",
+	"Antonio Caruso",
+	"El perro Toby",
+	"Simon Kingsley",
+	"Alfred",
+	"Lady Brumwell",
+	"Madame Rosa",
+	"Joseph Moorehead",
+	"Mrs. Beale",
+	"Felix",
+	"Hollingston",
+	"El agente Callaghan",
+	"El sargento Duncan",
+	"Lord Brumwell",
+	"Nigel Jaimeson",
+	"Jonas",
+	"El agente Dugan"
 };
 
 // =========================================
diff --git a/engines/sherlock/scalpel/scalpel_fixed_text.h b/engines/sherlock/scalpel/scalpel_fixed_text.h
index eae86b8..b8f5171 100644
--- a/engines/sherlock/scalpel/scalpel_fixed_text.h
+++ b/engines/sherlock/scalpel/scalpel_fixed_text.h
@@ -69,7 +69,68 @@ enum FixedTextId {
 	kFixedText_InitInventory_Letter,
 	kFixedText_InitInventory_Tarot,
 	kFixedText_InitInventory_OrnateKey,
-	kFixedText_InitInventory_PawnTicket
+	kFixedText_InitInventory_PawnTicket,
+	// People names
+	kFixedText_People_SherlockHolmes,
+	kFixedText_People_DrWatson,
+	kFixedText_People_InspectorLestrade,
+	kFixedText_People_ConstableOBrien,
+	kFixedText_People_ConstableLewis,
+	kFixedText_People_SheilaParker,
+	kFixedText_People_HenryCarruthers,
+	kFixedText_People_Lesley,
+	kFixedText_People_AnUsher,
+	kFixedText_People_FredrickEpstein,
+	kFixedText_People_MrsWorthington,
+	kFixedText_People_TheCoach,
+	kFixedText_People_APlayer,
+	kFixedText_People_Tim,
+	kFixedText_People_JamesSanders,
+	kFixedText_People_Belle,
+	kFixedText_People_CleaningGirl,
+	kFixedText_People_Wiggins,
+	kFixedText_People_Paul,
+	kFixedText_People_TheBartender,
+	kFixedText_People_ADirtyDrunk,
+	kFixedText_People_AShoutingDrunk,
+	kFixedText_People_AStaggeringDrunk,
+	kFixedText_People_TheBouncer,
+	kFixedText_People_TheCoroner,
+	kFixedText_People_ReginaldSnipes,
+	kFixedText_People_GeorgeBlackwood,
+	kFixedText_People_Lars,
+	kFixedText_People_TheChemist,
+	kFixedText_People_InspectorGregson,
+	kFixedText_People_JacobFarthington,
+	kFixedText_People_Mycroft,
+	kFixedText_People_OldSherman,
+	kFixedText_People_Richard,
+	kFixedText_People_TheBarman,
+	kFixedText_People_ADandyPlayer,
+	kFixedText_People_ARoughlookingPlayer,
+	kFixedText_People_ASpectator,
+	kFixedText_People_RobertHunt,
+	kFixedText_People_Violet,
+	kFixedText_People_Pettigrew,
+	kFixedText_People_Augie,
+	kFixedText_People_AnnaCarroway,
+	kFixedText_People_AGuard,
+	kFixedText_People_AntonioCaruso,
+	kFixedText_People_TobyTheDog,
+	kFixedText_People_SimonKingsley,
+	kFixedText_People_Alfred,
+	kFixedText_People_LadyBrumwell,
+	kFixedText_People_MadameRosa,
+	kFixedText_People_JosephMoorehead,
+	kFixedText_People_MrsBeale,
+	kFixedText_People_Felix,
+	kFixedText_People_Hollingston,
+	kFixedText_People_ConstableCallaghan,
+	kFixedText_People_SergeantDuncan,
+	kFixedText_People_LordBrumwell,
+	kFixedText_People_NigelJaimeson,
+	kFixedText_People_Jonas,
+	kFixedText_People_ConstableDugan
 };
 
 struct FixedTextActionEntry {






More information about the Scummvm-git-logs mailing list