From 133b4defe9f37ac1b2198b843282ab0b0a0e7b6b Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Sun, 14 Jun 2015 20:40:02 +0200 Subject: SHERLOCK: initial inventory via fixed text class initial inventory is now localized --- engines/sherlock/fixed_text.cpp | 46 +++++++++++++++++++++++++++++++++--- engines/sherlock/fixed_text.h | 15 +++++++++++- engines/sherlock/scalpel/scalpel.cpp | 38 +++++++++++++++++++---------- 3 files changed, 83 insertions(+), 16 deletions(-) (limited to 'engines/sherlock') diff --git a/engines/sherlock/fixed_text.cpp b/engines/sherlock/fixed_text.cpp index 2e0ae4a6fb..5fce69e84f 100644 --- a/engines/sherlock/fixed_text.cpp +++ b/engines/sherlock/fixed_text.cpp @@ -52,7 +52,20 @@ static const Common::String fixedTextEN[] = { "Exit", "Backward", "Forward", - "Text Not Found !" + "Text Not Found !", + // Initial Inventory + "A message requesting help", + "A number of business cards", + "Opera Tickets", + "Cuff Link", + "Wire Hook", + "Note", + "An open pocket watch", + "A piece of paper with numbers on it", + "A letter folded many times", + "Tarot Cards", + "An ornate key", + "A pawn ticket" }; // sharp-s : 0xE1 / octal 341 @@ -86,11 +99,25 @@ static const Common::String fixedTextDE[] = { "Zur\201ck", "R\201ckw\204rts", // original: "Backward" "Vorw\204rts", // original: "Forward" - "Text nicht gefunden!" + "Text nicht gefunden!", + // Initial Inventory + "Ein Hilferuf von Lestrade", + "Holmes' Visitenkarten", + "Karten f\201rs Opernhaus", + "Manschettenkn\224pfe", + "Zum Haken verbogener Drahtkorb", + "Mitteilung am Epstein", + "Eine offene Taschenuhr", + "Ein Zettel mit Zahlen drauf", + "Ein mehrfach gefalteter Briefbogen", + "Ein Tarock-Kartenspiel", // [sic] + "Ein verzierter Schl\201ssel", + "Ein Pfandschein" }; // up-side down exclamation mark - 0xAD / octal 255 // up-side down question mark - 0xA8 / octal 250 +// n with a wave on top - 0xA4 / octal 244 static const Common::String fixedTextES[] = { // Window buttons "Exit", @@ -118,7 +145,20 @@ static const Common::String fixedTextES[] = { "Exit", "Retroceder", "Avanzar", - "Texto no encontrado!" + "Texto no encontrado!", + // Initial Inventory + "Un mensaje solicitando ayuda", + "Unas cuantas tarjetas de visita", + "Entradas para la opera", + "Unos gemelos", + "Un gancho de alambre", + "Una nota", + "Un reloj de bolsillo abierto", + "Un trozo de papel con unos numeros", + "Un carta muy plegada", + "Unas cartas de Tarot", + "Una llave muy vistosa", + "Una papeleta de empe\244o" }; // ========================================= diff --git a/engines/sherlock/fixed_text.h b/engines/sherlock/fixed_text.h index e6a85075ba..ac01470b3e 100644 --- a/engines/sherlock/fixed_text.h +++ b/engines/sherlock/fixed_text.h @@ -55,7 +55,20 @@ enum FixedTextId { kFixedText_JournalSearch_Exit, kFixedText_JournalSearch_Backward, kFixedText_JournalSearch_Forward, - kFixedText_JournalSearch_NotFound + kFixedText_JournalSearch_NotFound, + // Initial inventory + kFixedText_InitInventory_Message, + kFixedText_InitInventory_HolmesCard, + kFixedText_InitInventory_Tickets, + kFixedText_InitInventory_CuffLink, + kFixedText_InitInventory_WireHook, + kFixedText_InitInventory_Note, + kFixedText_InitInventory_OpenWatch, + kFixedText_InitInventory_Paper, + kFixedText_InitInventory_Letter, + kFixedText_InitInventory_Tarot, + kFixedText_InitInventory_OrnateKey, + kFixedText_InitInventory_PawnTicket }; enum FixedTextActionId { diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index cfe9b82d4e..130d1b3125 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -779,24 +779,38 @@ bool ScalpelEngine::showOfficeCutscene3DO() { } void ScalpelEngine::loadInventory() { + FixedText &fixedText = *_fixedText; Inventory &inv = *_inventory; + Common::String fixedText_Message = fixedText.getText(kFixedText_InitInventory_Message); + Common::String fixedText_HolmesCard = fixedText.getText(kFixedText_InitInventory_HolmesCard); + Common::String fixedText_Tickets = fixedText.getText(kFixedText_InitInventory_Tickets); + Common::String fixedText_CuffLink = fixedText.getText(kFixedText_InitInventory_CuffLink); + Common::String fixedText_WireHook = fixedText.getText(kFixedText_InitInventory_WireHook); + Common::String fixedText_Note = fixedText.getText(kFixedText_InitInventory_Note); + Common::String fixedText_OpenWatch = fixedText.getText(kFixedText_InitInventory_OpenWatch); + Common::String fixedText_Paper = fixedText.getText(kFixedText_InitInventory_Paper); + Common::String fixedText_Letter = fixedText.getText(kFixedText_InitInventory_Letter); + Common::String fixedText_Tarot = fixedText.getText(kFixedText_InitInventory_Tarot); + Common::String fixedText_OrnateKey = fixedText.getText(kFixedText_InitInventory_OrnateKey); + Common::String fixedText_PawnTicket = fixedText.getText(kFixedText_InitInventory_PawnTicket); + // Initial inventory inv._holdings = 2; - inv.push_back(InventoryItem(0, "Message", "A message requesting help", "_ITEM03A")); - inv.push_back(InventoryItem(0, "Holmes Card", "A number of business cards", "_ITEM07A")); + inv.push_back(InventoryItem(0, "Message", fixedText_Message, "_ITEM03A")); + inv.push_back(InventoryItem(0, "Holmes Card", fixedText_HolmesCard, "_ITEM07A")); // Hidden items - inv.push_back(InventoryItem(95, "Tickets", "Opera Tickets", "_ITEM10A")); - inv.push_back(InventoryItem(138, "Cuff Link", "Cuff Link", "_ITEM04A")); - inv.push_back(InventoryItem(138, "Wire Hook", "Wire Hook", "_ITEM06A")); - inv.push_back(InventoryItem(150, "Note", "Note", "_ITEM13A")); - inv.push_back(InventoryItem(481, "Open Watch", "An open pocket watch", "_ITEM62A")); - inv.push_back(InventoryItem(481, "Paper", "A piece of paper with numbers on it", "_ITEM44A")); - inv.push_back(InventoryItem(532, "Letter", "A letter folded many times", "_ITEM68A")); - inv.push_back(InventoryItem(544, "Tarot", "Tarot Cards", "_ITEM71A")); - inv.push_back(InventoryItem(544, "Ornate Key", "An ornate key", "_ITEM70A")); - inv.push_back(InventoryItem(586, "Pawn ticket", "A pawn ticket", "_ITEM16A")); + inv.push_back(InventoryItem(95, "Tickets", fixedText_Tickets, "_ITEM10A")); + inv.push_back(InventoryItem(138, "Cuff Link", fixedText_CuffLink, "_ITEM04A")); + inv.push_back(InventoryItem(138, "Wire Hook", fixedText_WireHook, "_ITEM06A")); + inv.push_back(InventoryItem(150, "Note", fixedText_Note, "_ITEM13A")); + inv.push_back(InventoryItem(481, "Open Watch", fixedText_OpenWatch, "_ITEM62A")); + inv.push_back(InventoryItem(481, "Paper", fixedText_Paper, "_ITEM44A")); + inv.push_back(InventoryItem(532, "Letter", fixedText_Letter, "_ITEM68A")); + inv.push_back(InventoryItem(544, "Tarot", fixedText_Tarot, "_ITEM71A")); + inv.push_back(InventoryItem(544, "Ornate Key", fixedText_OrnateKey, "_ITEM70A")); + inv.push_back(InventoryItem(586, "Pawn ticket", fixedText_PawnTicket, "_ITEM16A")); } void ScalpelEngine::showLBV(const Common::String &filename) { -- cgit v1.2.3