SHERLOCK: RT: Rename hangman puzzle to foolscap puzzle

6 files changed, 23 insertions, 23 deletions

diff --git a/engines/sherlock/module.mk b/engines/sherlock/module.mk
index c602021b83..e58a2a1e81 100644
--- a/engines/sherlock/module.mk
+++ b/engines/sherlock/module.mk
@@ -35,7 +35,7 @@ MODULE_OBJS = \
 	tattoo/widget_base.o \
 	tattoo/widget_credits.o \
 	tattoo/widget_files.o \
-	tattoo/widget_hangman.o \
+	tattoo/widget_foolscap.o \
 	tattoo/widget_inventory.o \
 	tattoo/widget_lab.o \
 	tattoo/widget_options.o \
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 110d13b9f5..889a0429e7 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -35,7 +35,7 @@ namespace Sherlock {
 namespace Tattoo {
 
 TattooEngine::TattooEngine(OSystem *syst, const SherlockGameDescription *gameDesc) :
-		SherlockEngine(syst, gameDesc), _darts(this), _hangmanWidget(this) {
+		SherlockEngine(syst, gameDesc), _darts(this), _foolscapWidget(this) {
 	_runningProlog = false;
 	_fastMode = false;
 	_allowFastMode = true;
@@ -175,8 +175,8 @@ void TattooEngine::loadInventory() {
 	inv.push_back(InventoryItem(818, inv8, invDesc8, "_LANT02I"));
 }
 
-void TattooEngine::doHangManPuzzle() {
-	_hangmanWidget.show();
+void TattooEngine::doFoolscapPuzzle() {
+	_foolscapWidget.show();
 }
 
 void TattooEngine::loadConfig() {
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index 8a19746a0f..022a0ad897 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -25,7 +25,7 @@
 
 #include "sherlock/sherlock.h"
 #include "sherlock/tattoo/tattoo_darts.h"
-#include "sherlock/tattoo/widget_hangman.h"
+#include "sherlock/tattoo/widget_foolscap.h"
 
 namespace Sherlock {
 
@@ -55,7 +55,7 @@ enum {
 class TattooEngine : public SherlockEngine {
 private:
 	Darts _darts;
-	WidgetHangman _hangmanWidget;
+	WidgetFoolscap _foolscapWidget;
 
 	/**
 	 * Loads the initial palette for the game
@@ -93,9 +93,9 @@ public:
 	virtual ~TattooEngine();
 
 	/**
-	 * Shows the hangman puzzle
+	 * Shows the foolscap puzzle
 	 */
-	void doHangManPuzzle();
+	void doFoolscapPuzzle();
 
 	/**
 	 * Save the game configuration
diff --git a/engines/sherlock/tattoo/widget_hangman.cpp b/engines/sherlock/tattoo/widget_foolscap.cpp
index f41c5e43f0..9b906aee33 100644
--- a/engines/sherlock/tattoo/widget_hangman.cpp
+++ b/engines/sherlock/tattoo/widget_foolscap.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "sherlock/tattoo/widget_hangman.h"
+#include "sherlock/tattoo/widget_foolscap.h"
 #include "sherlock/tattoo/tattoo_fixed_text.h"
 #include "sherlock/tattoo/tattoo_scene.h"
 #include "sherlock/tattoo/tattoo_user_interface.h"
@@ -30,7 +30,7 @@ namespace Sherlock {
 
 namespace Tattoo {
 
-WidgetHangman::WidgetHangman(TattooEngine *vm) : WidgetBase(vm) {
+WidgetFoolscap::WidgetFoolscap(TattooEngine *vm) : WidgetBase(vm) {
 	for (int idx = 0; idx < 3; ++idx)
 		Common::fill(&_answers[idx][0], &_answers[idx][10], 0);
 	_images = nullptr;
@@ -42,11 +42,11 @@ WidgetHangman::WidgetHangman(TattooEngine *vm) : WidgetBase(vm) {
 	_solved = false;
 }
 
-WidgetHangman::~WidgetHangman() {
+WidgetFoolscap::~WidgetFoolscap() {
 	delete _images;
 }
 
-void WidgetHangman::show() {
+void WidgetFoolscap::show() {
 	Screen &screen = *_vm->_screen;
 	TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
 
@@ -122,7 +122,7 @@ void WidgetHangman::show() {
 	ui._menuMode = FOOLSCAP_MODE;
 } 
 
-void WidgetHangman::handleEvents() {
+void WidgetFoolscap::handleEvents() {
 	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 	TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
@@ -174,7 +174,7 @@ void WidgetHangman::handleEvents() {
 	}
 }
 
-void WidgetHangman::handleKeyboardEvents() {
+void WidgetFoolscap::handleKeyboardEvents() {
 	Screen &screen = *_vm->_screen;
 	TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
 	Common::KeyState keyState = ui._keyState;
@@ -258,14 +258,14 @@ void WidgetHangman::handleKeyboardEvents() {
 	}
 }
 
-void WidgetHangman::restoreChar() {
+void WidgetFoolscap::restoreChar() {
 	Screen &screen = *_vm->_screen;
 	ImageFrame &bgFrame = (*_images)[0];
 	_surface.blitFrom(bgFrame, _cursorPos, Common::Rect(_cursorPos.x, _cursorPos.y,
 		_cursorPos.x + screen.widestChar(), _cursorPos.y + screen.fontHeight()));
 }
 
-void WidgetHangman::close() {
+void WidgetFoolscap::close() {
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	Talk &talk = *_vm->_talk;
 	TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
diff --git a/engines/sherlock/tattoo/widget_hangman.h b/engines/sherlock/tattoo/widget_foolscap.h
index c653f93c29..5ed1edee4e 100644
--- a/engines/sherlock/tattoo/widget_hangman.h
+++ b/engines/sherlock/tattoo/widget_foolscap.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef SHERLOCK_TATTOO_HANGMAN_H
-#define SHERLOCK_TATTOO_HANGMAN_H
+#ifndef SHERLOCK_TATTOO_FOOLSCAP_H
+#define SHERLOCK_TATTOO_FOOLSCAP_H
 
 #include "sherlock/tattoo/widget_base.h"
 #include "sherlock/image_file.h"
@@ -32,7 +32,7 @@ namespace Tattoo {
 
 class TattooEngine;
 
-class WidgetHangman: public WidgetBase {
+class WidgetFoolscap: public WidgetBase {
 private:
 	ImageFile *_images;
 	Common::Point _lines[3];
@@ -56,8 +56,8 @@ private:
 	 */
 	void restoreChar();
 public:
-	WidgetHangman(TattooEngine *vm);
-	virtual ~WidgetHangman();
+	WidgetFoolscap(TattooEngine *vm);
+	virtual ~WidgetFoolscap();
 
 	/**
 	 * Show the hangman puzzle
diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
index 8ec3bd7dd3..4653172481 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -407,7 +407,7 @@ void WidgetInventoryVerbs::handleEvents() {
 				ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE;
 
 				scene.doBgAnim();
-				vm.doHangManPuzzle();
+				vm.doFoolscapPuzzle();
 			} else if (_invVerbSelect == 0) {
 				// They have released the mouse on the Look Verb command, so Look at the inventory item
 				ui._invLookFlag = true;
@@ -733,7 +733,7 @@ void WidgetInventory::handleEvents() {
 							ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE;
 
 							scene.doBgAnim();
-							vm.doHangManPuzzle();
+							vm.doFoolscapPuzzle();
 						} else {
 							ui._invLookFlag = true;
 							inv.freeInv();