Leahnaya/bemaniutils
1
0
Fork 0
mirror of https://github.com/DragonMinded/bemaniutils.git synced 2026-08-28 05:14:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix edge case where bytecode tried to rewind an animation entirely and failed due to being outside of the frame boundary instead of starting from the first frame.

Browse Source
This commit is contained in:
Jennifer Taylor
2021-08-10 23:36:39 +00:00
parent ac707e767b
commit d04c366497
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bemani/format/afp/render.py
View File

@@ -235,8 +235,10 @@ class PlacedClip(PlacedObject):
if actual_frame is None:
print(f"WARNING: Unrecognized frame {frame} to gotoAndStop function!")
return
if actual_frame <= 0 or actual_frame > len(self.source.frames):
return
if actual_frame <= 0:
actual_frame = 1
if actual_frame > len(self.source.frames):
actual_frame = len(self.source.frames)
self.requested_frame = actual_frame
self.playing = False
@@ -245,8 +247,10 @@ class PlacedClip(PlacedObject):
if actual_frame is None:
print(f"WARNING: Non-integer frame {frame} to gotoAndPlay function!")
return
if actual_frame <= 0 or actual_frame > len(self.source.frames):
return
if actual_frame <= 0:
actual_frame = 1
if actual_frame > len(self.source.frames):
actual_frame = len(self.source.frames)
self.requested_frame = actual_frame
self.playing = True
@@ -262,8 +266,10 @@ class PlacedClip(PlacedObject):
print(f"WARNING: Non-integer frame {frame} to setInvisibleUntil function!")
return
self.visible = False
if actual_frame <= 0 or actual_frame > len(self.source.frames):
return
if actual_frame <= 0:
actual_frame = 1
if actual_frame > len(self.source.frames):
actual_frame = len(self.source.frames)
self.visible_frame = actual_frame
@property
@@ -276,8 +282,10 @@ class PlacedClip(PlacedObject):
if actual_frame is None:
print(f"WARNING: Non-integer frameOffset {val} to frameOffset attribute!")
return
if actual_frame < 0 or actual_frame >= len(self.source.frames):
return
if actual_frame < 0:
actual_frame = 0
if actual_frame >= len(self.source.frames):
actual_frame = len(self.source.frames) - 1
self.requested_frame = actual_frame + 1