PINK: Again small fix for ActionLoop

scummvm · Jun 28, 2018 · 74437ee · 74437ee
1 parent 05992bf
commit 74437ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/engines/pink/archive.cpp b/engines/pink/archive.cpp
@@ -297,6 +297,10 @@ uint32 Archive::readDWORD() {
     return _file.readUint32LE();
 }
 
+uint16 Archive::readWORD() {
+    return _file.readUint16LE();
+}
+
 } // End of namespace Pink
 
 
diff --git a/engines/pink/archive.h b/engines/pink/archive.h
@@ -43,6 +43,8 @@ class Archive {
 
     int readCount();
     uint32 readDWORD();
+    uint16 readWORD();
+
     Object *readObject();
     Common::String readString();
 
@@ -82,6 +84,11 @@ inline Archive &operator>>(Archive &archive, uint32 &num){
     return archive;
 }
 
+inline Archive &operator>>(Archive &archive, uint16 &num){
+    num = archive.readWORD();
+    return archive;
+}
+
 inline Archive &operator>>(Archive &archive, Common::StringArray &array){
     uint32 size = archive.readCount();
     array.resize(size);

diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp
@@ -29,7 +29,7 @@ namespace Pink {
 
 void ActionLoop::deserialize(Archive &archive) {
     ActionPlay::deserialize(archive);
-    uint32 style;
+    uint16 style;
     archive >> _intro >> style;
     switch (style) {
         case kPingPong: