enable editor flag

diff --git a/.gitmodules b/.gitmodules
index 6ec826a..4341c78 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "lib/pgfw"]
     path = lib/pgfw
-    url = makar:/var/www/git/pgfw/
+    url = frank@shampoo.ooo:/var/www/git/pgfw/
     branch = master

diff --git a/OPEN-GAME b/OPEN-GAME
index 9ebd442..92d036f 100755 (executable)
--- a/OPEN-GAME
+++ b/OPEN-GAME
@@ -2,7 +2,7 @@
 
 from os import environ, execvp, chdir, getcwd
 from os.path import exists, join, dirname
-from sys import version_info, argv, maxint
+from sys import version_info, argv
 
 def can_import(module_name):
     try:

diff --git a/PictureProcessing.py b/PictureProcessing.py
index daaaaf5..13607f6 100644 (file)
--- a/PictureProcessing.py
+++ b/PictureProcessing.py
@@ -30,6 +30,7 @@ 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.sound_effects = SoundEffects(self)
         self.glyphs = Glyphs(self)
         self.editor = Editor(self)
@@ -2112,6 +2113,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]
         height = glyphs.get_tile(0).get_height() * len(option_texts) + \
                  self.MENU_MARGIN * (len(option_texts) - 1) + \
                  self.MENU_PADDING * 2 + 3

diff --git a/config b/config
index 8f8c44c..134a2c5 100644 (file)
--- a/config
+++ b/config
@@ -41,6 +41,7 @@ framerate = 100
 temp-directory = /tmp/
 
 [editor]
+enabled = no
 root-directory = resource/editor
 levels-directory = levels
 original-directory = original

diff --git a/lib/pgfw b/lib/pgfw
index 717b2eb..e16edef 160000 (submodule)
--- a/lib/pgfw
+++ b/lib/pgfw
@@ -1 +1 @@
-Subproject commit 717b2eb6860cc1a4804bc258a0b07c5013caf3d5
+Subproject commit e16edef965d4cab364f8defa47d0dfaa0c1b1941

diff --git a/resource/progress b/resource/progress
index 9dd2f00..6761bcb 100644 (file)
--- a/resource/progress
+++ b/resource/progress
@@ -1 +1 @@
-2 37
+1 16

diff --git a/setup.py b/setup.py
index 24962ef..5cade86 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ if __name__ == "__main__":
               app=[dict(script="OPEN-GAME", plist=plist)],
               setup_requires=["py2app"],
               options=dict(py2app=dict(arch="i386",)),
-              data_files=["wisp", "resource", "lib", "config", "OFL.txt"])
+              data_files=["OPEN-GAME", "PictureProcessing.py", "resource", "lib", "config"])
     elif platform == "win32":
         from lib.pgfw.pgfw.SetupWin import SetupWin
         SetupWin().setup()