X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2F__main__.py;h=02f49a3e7c8c2298537f06347dc9b6dcdced6f91;hb=c7c0aeb2347992dfb69844700711bd0ded2caf0c;hp=70330cbbd82173d8184a4095184ae82e468676d0;hpb=2db9ad1ca0004af92e7e00a81cadcf8e4b51f4ae;p=naja.git

diff --git a/naja/__main__.py b/naja/__main__.py
index 70330cb..02f49a3 100644
--- a/naja/__main__.py
+++ b/naja/__main__.py
@@ -7,8 +7,8 @@ from naja.constants import SCREEN
 from naja.engine import Engine
 from naja.sound import sound
 from naja.options import parse_args
+from naja.resources.loader import Loader
 from naja.scenes.menu import MenuScene
-from naja.gamestate import GameState
 
 
 def main():
@@ -17,14 +17,23 @@ 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
+    icon_filename = 'robot_24.png'
+    # OSX accepts big icons, but scales up small icons smoothly
+    if sys.platform == 'darwin':
+        icon_filename = 'robot_512.png'
+    pygame.display.set_icon(r.get_image(icon_filename, 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(state)
-    engine = Engine(screen, scene, state)
+    scene = MenuScene(None)
+    engine = Engine(screen, scene, None)
     engine.run()