diff options
author | Paul Gilbert | 2015-06-21 09:47:59 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-21 09:47:59 -0400 |
commit | dec2b0857ca54ecf61e95c731d10ebfb85b5b375 (patch) | |
tree | 4a3499ec5f2bfd064e6cb0d7c015db090160dc3f /engines/sherlock/tattoo | |
parent | 3adaf2f999c4af74534beb7d02638aba8cc81a1e (diff) | |
download | scummvm-rg350-dec2b0857ca54ecf61e95c731d10ebfb85b5b375.tar.gz scummvm-rg350-dec2b0857ca54ecf61e95c731d10ebfb85b5b375.tar.bz2 scummvm-rg350-dec2b0857ca54ecf61e95c731d10ebfb85b5b375.zip |
SHERLOCK: Split up Journal class for each game
Diffstat (limited to 'engines/sherlock/tattoo')
-rw-r--r-- | engines/sherlock/tattoo/tattoo_journal.cpp | 39 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_journal.h | 47 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/tattoo/widget_inventory.cpp | 2 |
4 files changed, 88 insertions, 2 deletions
diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp new file mode 100644 index 0000000000..ff4f6b3eda --- /dev/null +++ b/engines/sherlock/tattoo/tattoo_journal.cpp @@ -0,0 +1,39 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "sherlock/tattoo/tattoo_journal.h" +#include "sherlock/sherlock.h" + +namespace Sherlock { + +namespace Tattoo { + +TattooJournal::TattooJournal(SherlockEngine *vm) : Journal(vm) { +} + +void TattooJournal::synchronize(Serializer &s) { + // TODO +} + +} // End of namespace Tattoo + +} // End of namespace Sherlock diff --git a/engines/sherlock/tattoo/tattoo_journal.h b/engines/sherlock/tattoo/tattoo_journal.h new file mode 100644 index 0000000000..ebfcd4691b --- /dev/null +++ b/engines/sherlock/tattoo/tattoo_journal.h @@ -0,0 +1,47 @@ +/* ScummVM - Graphic Adventure Engine +* +* ScummVM is the legal property of its developers, whose names +* are too numerous to list here. Please refer to the COPYRIGHT +* file distributed with this source distribution. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* +*/ + +#ifndef SHERLOCK_TATTOO_JOURNAL_H +#define SHERLOCK_TATTOO_JOURNAL_H + +#include "sherlock/journal.h" + +namespace Sherlock { + +namespace Tattoo { + +class TattooJournal : public Journal { +public: + TattooJournal(SherlockEngine *vm); + virtual ~TattooJournal() {} + + /** + * Synchronize the data for a savegame + */ + virtual void synchronize(Serializer &s); +}; + +} // End of namespace Tattoo + +} // End of namespace Sherlock + +#endif diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp index 322655fa88..462eccc132 100644 --- a/engines/sherlock/tattoo/tattoo_user_interface.cpp +++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp @@ -487,7 +487,7 @@ void TattooUserInterface::doStandardControl() { if (people[_bgFound - 1000]._description.empty() || people[_bgFound - 1000]._description.hasPrefix(" ")) noDesc = true; } else if (_bgFound != -1) { - if (people[_bgFound - 1000]._description.empty() || people[_bgFound - 1000]._description.hasPrefix(" ")) + if (_bgShape->_description.empty() || _bgShape->_description.hasPrefix(" ")) noDesc = true; } else { noDesc = true; diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp index ee8faa3759..60da821a1f 100644 --- a/engines/sherlock/tattoo/widget_inventory.cpp +++ b/engines/sherlock/tattoo/widget_inventory.cpp @@ -532,7 +532,7 @@ void WidgetInventory::handleEvents() { } void WidgetInventory::updateDescription() { - + // TODO } void WidgetInventory::checkInvTabbingKeys() { |