libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 21:21:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SHERLOCK: Remove duplicated _converseNum field from Journal

Browse Source
This commit is contained in:
Paul Gilbert 2015-05-09 12:58:44 -04:00
parent 66a1138d74
commit eeb53ca614
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/sherlock/journal.cpp
View File

@ -56,7 +56,6 @@ Journal::Journal(SherlockEngine *vm): _vm(vm) {
_sub = 0;
_up = _down = false;
_page = 1;
_converseNum = -1;
// Load the journal directory and location names
loadJournalLocations();
@ -151,11 +150,11 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
// If not flagged as alrady loaded, load the conversation into script variables
if (!alreadyLoaded) {
// See if the file to be used is already loaded
if (journalEntry._converseNum != _converseNum) {
if (journalEntry._converseNum != talk._converseNum) {
// Nope. Free any previously loaded talk
talk.freeTalkVars();
// Find the person being talked to
// Find the person being referred to
talk._talkTo = -1;
for (int idx = 0; idx < MAX_PEOPLE; ++idx) {
Common::String portrait = PORTRAITS[idx];
@ -167,7 +166,7 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
}
}
// Load the talk file
// Load their talk file
talk.loadTalkFile(dirFilename);
}
}
@ -559,6 +558,7 @@ void Journal::doArrows() {
bool Journal::drawJournal(int direction, int howFar) {
Events &events = *_vm->_events;
Screen &screen = *_vm->_screen;
Talk &talk = *_vm->_talk;
int yp = 37;
int startPage = _page;
bool endJournal = false;
@ -571,7 +571,7 @@ bool Journal::drawJournal(int direction, int howFar) {
const char *matchP;
int width;
_converseNum = -1;
talk._converseNum = -1;
_down = true;
do {

1
engines/sherlock/journal.h
View File

@ -55,7 +55,6 @@ private:
int _sub;
bool _up, _down;
int _page;
int _converseNum;
Common::String _find;
void loadJournalLocations();

2
engines/sherlock/talk.h
View File

@ -137,7 +137,6 @@ private:
int _speaker;
int _talkIndex;
int _scriptSelect;
int _converseNum;
int _talkStealth;
int _talkToFlag;
int _scriptSaveIndex;
@ -160,6 +159,7 @@ public:
int _scriptMoreFlag;
Common::String _scriptName;
bool _moreTalkUp, _moreTalkDown;
int _converseNum;
public:
Talk(SherlockEngine *vm);
void setSequences(const byte *talkSequences, const byte *stillSequences,