projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better location shifting.
[naja.git]
/
naja
/
__main__.py
diff --git
a/naja/__main__.py
b/naja/__main__.py
index cd53e4a3667e37bb0f7fe98a40934dcdc26eefd8..70330cbbd82173d8184a4095184ae82e468676d0 100644
(file)
--- a/
naja/__main__.py
+++ b/
naja/__main__.py
@@
-5,7
+5,10
@@
import pygame.locals as pgl
from naja.constants import SCREEN
from naja.engine import Engine
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
+from naja.scenes.menu import MenuScene
+from naja.gamestate import GameState
def main():
def main():
@@
-16,7
+19,14
@@
def main():
pygame.display.set_mode(SCREEN, pgl.SWSURFACE)
pygame.display.set_caption('Naja')
pygame.display.set_mode(SCREEN, pgl.SWSURFACE)
pygame.display.set_caption('Naja')
+ sound.init()
screen = pygame.display.get_surface()
screen = pygame.display.get_surface()
- engine = Engine(screen)
+ state = GameState()
+ scene = MenuScene(state)
+ engine = Engine(screen, scene, state)
engine.run()
engine.run()
+
+
+if __name__ == '__main__':
+ main()