Mercurial > touhou

diff pytouhou/formats/pbg3.py @ 590:e15672733c93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to Python 3.x instead of 2.7.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Tue, 30 Sep 2014 17:14:24 +0200
parents 6b76c9ba3975
children d1f0bb0b7a17
line wrap: on
line diff
--- a/pytouhou/formats/pbg3.py
+++ b/pytouhou/formats/pbg3.py
@@ -118,7 +118,7 @@ class PBG3(object):
             checksum = bitstream.read_int() # Checksum of *compressed data*
             offset = bitstream.read_int()
             size = bitstream.read_int()
-            name = bitstream.read_string(255).decode('ascii')
+            name = bitstream.read_string(255)
             entries[name] = PBG3Entry(unknown1, unknown2, checksum, offset, size)
 
         return PBG3(entries, bitstream)
@@ -148,7 +148,7 @@ class PBG3(object):
             self.bitstream.seek(offset)
             value = 0
             for c in self.bitstream.io.read(compressed_size):
-                value += ord(c)
+                value += c
                 value &= 0xFFFFFFFF
             if value != checksum:
                 logger.warn('corrupted data!')