aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scalpel/scalpel_journal.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-26 21:51:18 -0400
committerPaul Gilbert2015-07-26 21:51:18 -0400
commitbcfe38c24f032715e732422069f25ae5ef1f2a81 (patch)
tree3929434d5d5dc121c7224240fe0370c923f171d4 /engines/sherlock/scalpel/scalpel_journal.cpp
parent6f121be1c26adb406e204c1644cf1f5c8b3960e8 (diff)
downloadscummvm-rg350-bcfe38c24f032715e732422069f25ae5ef1f2a81.tar.gz
scummvm-rg350-bcfe38c24f032715e732422069f25ae5ef1f2a81.tar.bz2
scummvm-rg350-bcfe38c24f032715e732422069f25ae5ef1f2a81.zip
SHERLOCK: RT: Move Journal record method back to Journal class
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_journal.cpp')
-rw-r--r--engines/sherlock/scalpel/scalpel_journal.cpp37
1 files changed, 0 insertions, 37 deletions
diff --git a/engines/sherlock/scalpel/scalpel_journal.cpp b/engines/sherlock/scalpel/scalpel_journal.cpp
index 8e356c0f65..e54f1bc490 100644
--- a/engines/sherlock/scalpel/scalpel_journal.cpp
+++ b/engines/sherlock/scalpel/scalpel_journal.cpp
@@ -60,49 +60,12 @@ static const int SEARCH_POINTS[3][3] = {
/*----------------------------------------------------------------*/
ScalpelJournal::ScalpelJournal(SherlockEngine *vm) : Journal(vm) {
- // Initialize fields
- _maxPage = 0;
- _index = 0;
- _sub = 0;
- _up = _down = false;
- _page = 1;
-
if (_vm->_interactiveFl) {
// Load the journal directory and location names
loadLocations();
}
}
-void ScalpelJournal::record(int converseNum, int statementNum, bool replyOnly) {
- int saveIndex = _index;
- int saveSub = _sub;
-
- if (IS_3DO) {
- // there seems to be no journal in the 3DO version
- return;
- }
-
- // Record the entry into the list
- _journal.push_back(JournalEntry(converseNum, statementNum, replyOnly));
- _index = _journal.size() - 1;
-
- // Load the text for the new entry to get the number of lines it will have
- loadJournalFile(true);
-
- // Restore old state
- _index = saveIndex;
- _sub = saveSub;
-
- // If new lines were added to the ournal, update the total number of lines
- // the journal continues
- if (!_lines.empty()) {
- _maxPage += _lines.size();
- } else {
- // No lines in entry, so remove the new entry from the journal
- _journal.remove_at(_journal.size() - 1);
- }
-}
-
void ScalpelJournal::loadLocations() {
Resources &res = *_vm->_res;