fixed version

[pmachines.git] / game / app.py

diff --git a/game/app.py b/game/app.py
index 44567a6c06a401d29ab37dadd95ef22488ecec38..057a6808f94f0bf9edc929c87d255c2c78cd87c4 100755 (executable)
--- a/game/app.py
+++ b/game/app.py
@@ -65,7 +65,7 @@ class PmachinesApp:
     def __init__(self):
         info('platform: %s' % platform)
         info('exists main.py: %s' % exists('main.py'))
-        args = self._parse_args()
+        self._args = args = self._parse_args()
         self._configure(args)
         self.base = ShowBase()
         self._pipeline = None
@@ -104,7 +104,7 @@ class PmachinesApp:
         self._menu_bg = Background()
         self._menu = Menu(
             self._fsm, self.lang_mgr, self._options, self._music,
-            self._pipeline, self.scenes)
+            self._pipeline, self.scenes, self._args.functional_test or self._args.functional_ref)
 
     def on_home(self):
         self._fsm.demand('Menu')
@@ -198,12 +198,14 @@ class PmachinesApp:
         if res:
             res = LVector2i(*[int(_res) for _res in res.split('x')])
         else:
-            d_i = base.pipe.get_display_information()
-            def _res(idx):
-                return d_i.get_display_mode_width(idx), \
-                    d_i.get_display_mode_height(idx)
-            resolutions = [
-                _res(idx) for idx in range(d_i.get_total_display_modes())]
+            resolutions = []
+            if not self.version:
+                d_i = base.pipe.get_display_information()
+                def _res(idx):
+                    return d_i.get_display_mode_width(idx), \
+                        d_i.get_display_mode_height(idx)
+                resolutions = [
+                    _res(idx) for idx in range(d_i.get_total_display_modes())]
             res = sorted(resolutions)[-1]
         fullscreen = self._options['settings']['fullscreen']
         props = WindowProperties()
@@ -245,7 +247,6 @@ class PmachinesApp:
                 return task.cont
             taskMgr.add(update_coords, 'update_coords')
 
-
     def _set_physics(self):
         if self._options['development']['physics_debug']:
             debug_node = BulletDebugNode('Debug')