X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2F__main__.py;h=e3d00872c31df33c74ab10a2afafe6b514d26d26;hb=a6de62bab3beb608b3fd9f975947f4a46ec5d1c9;hp=98ee298e62ad0c12df4ce94636077fce3a15ebb2;hpb=78a001f6b445795f347d1ae7399d8f3b4072f779;p=naja.git

diff --git a/naja/__main__.py b/naja/__main__.py
index 98ee298..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.gamestate import GameState
+from naja.utils import warp_to_game_state
 
 
 def main():
@@ -17,14 +18,32 @@ def main():
     pygame.display.init()
     pygame.font.init()
 
+    # set_icon needs to be called before set_mode on some platforms, but we
+    # can't use convert_alpha until we've created a window with set_mode
+    r = Loader('data')
+    r.CONVERT_ALPHA = False
+    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('Naja')
+    pygame.display.set_caption('Robolock II')
     sound.init()
 
     screen = pygame.display.get_surface()
-    state = GameState()
-    scene = MenuScene()
-    engine = Engine(screen, scene, state)
+    scene = MenuScene(None)
+    engine = Engine(screen, scene, None)
+
+    if options.game_state is not None:
+        warp_to_game_state(options.game_state)
+
     engine.run()