# HG changeset patch # User Emmanuel Gil Peyrot # Date 1428511993 -7200 # Node ID df6ae915ebaa65364e0a453b12a86856b0031b07 # Parent 98603f2c32b4abfc4018dd2c9c5dda1870d32411 Don’t load stg?enm.anm two times if there is no stg?enm2.anm. diff --git a/pytouhou/games/eosd/game.py b/pytouhou/games/eosd/game.py --- a/pytouhou/games/eosd/game.py +++ b/pytouhou/games/eosd/game.py @@ -102,11 +102,11 @@ class Game(GameBase): nb_bullets_max=640): self.etama = common.etama #XXX + self.enm_anm = resource_loader.get_anm('stg%denm.anm' % stage) try: - self.enm_anm = resource_loader.get_multi_anm(('stg%denm.anm' % stage, - 'stg%denm2.anm' % stage)) + self.enm_anm = self.enm_anm + resource_loader.get_anm('stg%denm2.anm' % stage) except KeyError: - self.enm_anm = resource_loader.get_anm('stg%denm.anm' % stage) + pass ecl = resource_loader.get_ecl('ecldata%d.ecl' % stage) self.ecl_runners = [ECLMainRunner(main, ecl.subs, self) for main in ecl.mains]