python 2/3 updates in pgfw; editor enable flag conflict merge
authorAnton Marek <antonmarek@Antons-Mac-mini.local>
Wed, 3 Jul 2019 10:02:08 +0000 (06:02 -0400)
committerAnton Marek <antonmarek@Antons-Mac-mini.local>
Wed, 3 Jul 2019 10:02:08 +0000 (06:02 -0400)
1  2 
PictureProcessing.py
config
lib/pgfw

@@@ -30,7 -31,7 +31,8 @@@ class PictureProcessing(Game)
          Game.__init__(self)
          mixer.init(44100, -16, self.CHANNEL_COUNT, 4096)
          self.get_configuration().type_declarations.add("bool", "mouse", "resets")
-       self.get_configuration().type_declarations.add("bool", "editor", "enabled")
++        self.get_configuration().type_declarations.add("bool", "editor", "enabled")
+         self.get_configuration().type_declarations.add("bool", "display", "slides-enabled")
          self.sound_effects = SoundEffects(self)
          self.glyphs = Glyphs(self)
          self.editor = Editor(self)
@@@ -2113,8 -2224,6 +2225,8 @@@ class Title(Animation)
              option_texts = self.MENU_OPTIONS
          else:
              option_texts = [self.MENU_OPTIONS[0], self.MENU_OPTIONS[2]]
-       if not self.get_configuration("editor", "enabled"):
-           option_texts = option_texts[:-1]
++        if not self.get_configuration("editor", "enabled"):
++            option_texts = option_texts[:-1]
          height = glyphs.get_tile(0).get_height() * len(option_texts) + \
                   self.MENU_MARGIN * (len(option_texts) - 1) + \
                   self.MENU_PADDING * 2 + 3
diff --cc config
Simple merge
diff --cc lib/pgfw
+++ b/lib/pgfw
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e16edef965d4cab364f8defa47d0dfaa0c1b1941
 -Subproject commit db873683d3facee7659a0c98c2645a96f8433552
++Subproject commit c17842452b46d438ac3728755433d21dbd1d666d