aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk
diff options
context:
space:
mode:
authorAlyssa Milburn2011-06-28 15:28:26 +0200
committerAlyssa Milburn2011-06-28 15:28:26 +0200
commitc2319a3a81104deeaa1aaae2e5b22c8306ea4fa1 (patch)
tree7166c2eb194f18db8223b07d627e7e4378e8ed0d /engines/mohawk
parent168ba00ea36f8ef6e6127ef5091a5cf9f6c1b190 (diff)
downloadscummvm-rg350-c2319a3a81104deeaa1aaae2e5b22c8306ea4fa1.tar.gz
scummvm-rg350-c2319a3a81104deeaa1aaae2e5b22c8306ea4fa1.tar.bz2
scummvm-rg350-c2319a3a81104deeaa1aaae2e5b22c8306ea4fa1.zip
MOHAWK: Make LB's readString/readRect more generic.
Diffstat (limited to 'engines/mohawk')
-rw-r--r--engines/mohawk/livingbooks.cpp4
-rw-r--r--engines/mohawk/livingbooks.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 397281fe74..64383f6d2d 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -42,7 +42,7 @@
namespace Mohawk {
// read a null-terminated string from a stream
-Common::String MohawkEngine_LivingBooks::readString(Common::SeekableSubReadStreamEndian *stream) {
+Common::String MohawkEngine_LivingBooks::readString(Common::ReadStream *stream) {
Common::String ret;
while (!stream->eos()) {
byte in = stream->readByte();
@@ -54,7 +54,7 @@ Common::String MohawkEngine_LivingBooks::readString(Common::SeekableSubReadStrea
}
// read a rect from a stream
-Common::Rect MohawkEngine_LivingBooks::readRect(Common::SeekableSubReadStreamEndian *stream) {
+Common::Rect MohawkEngine_LivingBooks::readRect(Common::ReadStreamEndian *stream) {
Common::Rect rect;
// the V1 mac games have their rects in QuickDraw order
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 02fe34e8c2..c39e7f4227 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -655,8 +655,8 @@ public:
void addNotifyEvent(NotifyEvent event);
Common::SeekableSubReadStreamEndian *wrapStreamEndian(uint32 tag, uint16 id);
- Common::String readString(Common::SeekableSubReadStreamEndian *stream);
- Common::Rect readRect(Common::SeekableSubReadStreamEndian *stream);
+ Common::String readString(Common::ReadStream *stream);
+ Common::Rect readRect(Common::ReadStreamEndian *stream);
GUI::Debugger *getDebugger() { return _console; }
void addArchive(MohawkArchive *archive);