aboutsummaryrefslogtreecommitdiff
path: root/engines/pink
diff options
context:
space:
mode:
Diffstat (limited to 'engines/pink')
-rw-r--r--engines/pink/archive.cpp11
-rw-r--r--engines/pink/archive.h1
-rw-r--r--engines/pink/utils.h4
3 files changed, 2 insertions, 14 deletions
diff --git a/engines/pink/archive.cpp b/engines/pink/archive.cpp
index acb8b1683c..91eb5b9a9c 100644
--- a/engines/pink/archive.cpp
+++ b/engines/pink/archive.cpp
@@ -228,17 +228,6 @@ void Archive::mapObject(Object *obj) {
_objectIdMap.push_back(0);
}
-int Archive::readCount() {
- int count = _readStream->readUint16LE();
-
- if (count == 0xffff) {
- assert(0);
- count = _readStream->readUint32LE();
- }
-
- return count;
-}
-
Object *Archive::readObject() {
bool isCopyReturned;
Object *res = parseObject(isCopyReturned);
diff --git a/engines/pink/archive.h b/engines/pink/archive.h
index ad51819963..5ce7ff2ba7 100644
--- a/engines/pink/archive.h
+++ b/engines/pink/archive.h
@@ -44,7 +44,6 @@ public:
void mapObject(Object *obj);
- int readCount();
byte readByte() { return _readStream->readByte(); }
uint32 readDWORD() { return _readStream->readUint32LE(); }
uint16 readWORD() { return _readStream->readUint16LE(); }
diff --git a/engines/pink/utils.h b/engines/pink/utils.h
index 75a2464538..d55b8d95ce 100644
--- a/engines/pink/utils.h
+++ b/engines/pink/utils.h
@@ -31,7 +31,7 @@ template <typename T>
class Array : public Common::Array<T>, public Object {
public:
void deserialize(Archive &archive) {
- uint size = archive.readCount();
+ uint size = archive.readWORD();
this->resize(size);
for (uint i = 0; i < size; ++i) {
this->data()[i] = reinterpret_cast<T>(archive.readObject()); // dynamic_cast needs to know complete type
@@ -42,7 +42,7 @@ public:
class StringArray : public Common::StringArray {
public:
void deserialize(Archive &archive) {
- uint32 size = archive.readCount();
+ uint32 size = archive.readWORD();
this->resize(size);
for (uint i = 0; i < size; ++i) {
this->data()[i] = archive.readString();