aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-11-23 22:27:20 +0000
committerMax Horn2010-11-23 22:27:20 +0000
commit12d5151ff48adaf78bf75248155a1a78d8e3fbd2 (patch)
treed763bd5e4f3f28c9c53f90fc81a4201d80cb89f1
parent5d791cb090a6ead8594b956316f3735382703e8d (diff)
downloadscummvm-rg350-12d5151ff48adaf78bf75248155a1a78d8e3fbd2.tar.gz
scummvm-rg350-12d5151ff48adaf78bf75248155a1a78d8e3fbd2.tar.bz2
scummvm-rg350-12d5151ff48adaf78bf75248155a1a78d8e3fbd2.zip
COMMON: Remove default value for endianess in ReadStreamEndian subclasses
svn-id: r54441
-rw-r--r--common/memstream.h2
-rw-r--r--common/stream.h2
-rw-r--r--common/substream.h2
-rw-r--r--engines/saga/sprite.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/common/memstream.h b/common/memstream.h
index d6a55c3b75..13b8e26e8a 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -81,7 +81,7 @@ public:
*/
class MemoryReadStreamEndian : public MemoryReadStream, public ReadStreamEndian {
public:
- MemoryReadStreamEndian(const byte *buf, uint32 len, bool bigEndian = false)
+ MemoryReadStreamEndian(const byte *buf, uint32 len, bool bigEndian)
: MemoryReadStream(buf, len), ReadStreamEndian(bigEndian) {}
};
diff --git a/common/stream.h b/common/stream.h
index 141e37529c..99dcd8fa6e 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -398,7 +398,7 @@ private:
const bool _bigEndian;
public:
- ReadStreamEndian(bool bigEndian = false) : _bigEndian(bigEndian) {}
+ ReadStreamEndian(bool bigEndian) : _bigEndian(bigEndian) {}
uint16 readUint16() {
uint16 val;
diff --git a/common/substream.h b/common/substream.h
index 8c9c56165e..dc49ce9ecf 100644
--- a/common/substream.h
+++ b/common/substream.h
@@ -95,7 +95,7 @@ public:
*/
class SeekableSubReadStreamEndian : public SeekableSubReadStream, public ReadStreamEndian {
public:
- SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian = false, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
+ SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
: SeekableSubReadStream(parentStream, begin, end, disposeParentStream),
ReadStreamEndian(bigEndian) {
}
diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index cbe18040a2..bc3646e898 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -132,7 +132,7 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) {
spriteDataPointer = spritePointer + readS2.pos();
} else {
- Common::MemoryReadStreamEndian readS2(spritePointer, 4);
+ Common::MemoryReadStreamEndian readS2(spritePointer, 4, false);
spriteInfo->xAlign = readS2.readSByte();
spriteInfo->yAlign = readS2.readSByte();