Infer the number of bytes to skip automatically in the material decoder

Signed-off-by: Graham <gpe@openrs2.org>
4 years ago · d89c45940b
parent 1f9e7798e7
commit d89c45940b
1 changed files with 14 additions and 1 deletions
--- a/archive/src/main/kotlin/org/openrs2/archive/map/MapRenderer.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/map/MapRenderer.kt
@ -97,7 +97,20 @@ public class MapRenderer @Inject constructor(
                        }
                    }

-                    metadata.skipBytes(ids.size * 7)
+                    // the number of booleans to skip varies in different builds
+                    outer@ while (true) {
+                        val start = metadata.readerIndex()
+
+                        for (i in 0 until ids.size) {
+                            if (metadata.getUnsignedByte(start + i) > 1) {
+                                break@outer
+                            }
+                        }
+
+                        metadata.skipBytes(ids.size)
+                    }
+
+                    metadata.skipBytes(ids.size * 4)

                    for (id in ids) {
                        textures[id] = metadata.readUnsignedShort()