X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2F__main__.py;h=e3d00872c31df33c74ab10a2afafe6b514d26d26;hb=9f380d76b4ed0c8aaef84fc783e91003ad485c93;hp=7bc1442f33b4113bdb91db71562d7da54a7c32c0;hpb=05dec9325297def585919056b4c158d80856903c;p=naja.git

diff --git a/naja/__main__.py b/naja/__main__.py
index 7bc1442..e3d0087 100644
--- a/naja/__main__.py
+++ b/naja/__main__.py
@@ -6,9 +6,10 @@ import pygame.locals as pgl
 from naja.constants import SCREEN
 from naja.engine import Engine
 from naja.sound import sound
-from naja.options import parse_args
+from naja.options import parse_args, options
 from naja.resources.loader import Loader
 from naja.scenes.menu import MenuScene
+from naja.utils import warp_to_game_state
 
 
 def main():
@@ -21,7 +22,16 @@ def main():
     # can't use convert_alpha until we've created a window with set_mode
     r = Loader('data')
     r.CONVERT_ALPHA = False
-    pygame.display.set_icon(r.get_image('robot_24.png', basedir='icons'))
+    if sys.platform == 'darwin':
+        # OSX accepts big icons, but scales up small icons smoothly
+        icon_size = 512
+    elif sys.platform == 'win32':
+        # It's corrupted at any smaller size. And crashes, at larger sizes.
+        icon_size = 32
+    else:
+        icon_size = 24
+    pygame.display.set_icon(
+        r.get_image('robot_%i.png' % icon_size, basedir='icons'))
 
     pygame.display.set_mode(SCREEN, pgl.SWSURFACE)
     pygame.display.set_caption('Robolock II')
@@ -30,6 +40,10 @@ def main():
     screen = pygame.display.get_surface()
     scene = MenuScene(None)
     engine = Engine(screen, scene, None)
+
+    if options.game_state is not None:
+        warp_to_game_state(options.game_state)
+
     engine.run()