From 5a5a225216111b9507595a2ccfd37c3a518aa3a4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 21 Jun 2015 17:23:26 -0400
Subject: SHERLOCK: RT: Implemented further journal draw methods

---
 engines/sherlock/scalpel/scalpel_journal.cpp | 14 +++++++-------
 engines/sherlock/scalpel/scalpel_journal.h   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/sherlock/scalpel')

diff --git a/engines/sherlock/scalpel/scalpel_journal.cpp b/engines/sherlock/scalpel/scalpel_journal.cpp
index fc517dcd72..12ebe6f0f2 100644
--- a/engines/sherlock/scalpel/scalpel_journal.cpp
+++ b/engines/sherlock/scalpel/scalpel_journal.cpp
@@ -66,7 +66,7 @@ ScalpelJournal::ScalpelJournal(SherlockEngine *vm) : Journal(vm) {
 
 	if (_vm->_interactiveFl) {
 		// Load the journal directory and location names
-		loadJournalLocations();
+		loadLocations();
 	}
 }
 
@@ -100,7 +100,7 @@ void ScalpelJournal::record(int converseNum, int statementNum, bool replyOnly) {
 	}
 }
 
-void ScalpelJournal::loadJournalLocations() {
+void ScalpelJournal::loadLocations() {
 	Resources &res = *_vm->_res;
 
 	_directory.clear();
@@ -144,7 +144,7 @@ void ScalpelJournal::loadJournalLocations() {
 	delete loc;
 }
 
-void ScalpelJournal::drawJournalFrame() {
+void ScalpelJournal::drawFrame() {
 	FixedText &fixedText = *_vm->_fixedText;
 	Resources &res = *_vm->_res;
 	Screen &screen = *_vm->_screen;
@@ -213,7 +213,7 @@ void ScalpelJournal::drawJournalFrame() {
 void ScalpelJournal::drawInterface() {
 	Screen &screen = *_vm->_screen;
 
-	drawJournalFrame();
+	drawFrame();
 
 	if (_journal.empty()) {
 		_up = _down = 0;
@@ -437,7 +437,7 @@ bool ScalpelJournal::handleEvents(int key) {
 					_sub = savedSub;
 					_page = savedPage;
 
-					drawJournalFrame();
+					drawFrame();
 					drawJournal(0, 0);
 					notFound = true;
 				} else {
@@ -458,7 +458,7 @@ bool ScalpelJournal::handleEvents(int key) {
 		_up = _down = false;
 		_page = 1;
 
-		drawJournalFrame();
+		drawFrame();
 		drawJournal(0, 0);
 		doArrows();
 		screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
@@ -647,7 +647,7 @@ int ScalpelJournal::getSearchString(bool printError) {
 	}
 
 	// Redisplay the journal screen
-	drawJournalFrame();
+	drawFrame();
 	drawJournal(0, 0);
 	screen.slamArea(0, 0, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT);
 
diff --git a/engines/sherlock/scalpel/scalpel_journal.h b/engines/sherlock/scalpel/scalpel_journal.h
index fdf92819e7..9790461dbe 100644
--- a/engines/sherlock/scalpel/scalpel_journal.h
+++ b/engines/sherlock/scalpel/scalpel_journal.h
@@ -48,7 +48,7 @@ private:
 	/**
 	 * Load the list of journal locations
 	 */
-	void loadJournalLocations();
+	void loadLocations();
 
 	/**
 	 * Display the arrows that can be used to scroll up and down pages
@@ -81,7 +81,7 @@ public:
 	/**
 	 * Draw the journal background, frame, and interface buttons
 	 */
-	virtual void drawJournalFrame();
+	virtual void drawFrame();
 
 	/**
 	 * Records statements that are said, in the order which they are said. The player
-- 
cgit v1.2.3