Mercurial > touhou

changeset 623:df6ae915ebaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don’t load stg?enm.anm two times if there is no stg?enm2.anm.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Wed, 08 Apr 2015 18:53:13 +0200
parents 98603f2c32b4
children dd393fa6e988
files pytouhou/games/eosd/game.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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]