Changeset 411:03d5cb669298

Timestamp:

Nov 21, 2009, 11:18:08 AM (11 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Convert:

svn:b4e93282-eac8-4b8b-b765-0f5d36de2b68/trunk/rinkhals@416

Message:

Add config file and command line parameters.

Files:

• config.ini (added)
• gamelib/config.py (added)
• gamelib/engine.py (modified) (2 diffs)
• gamelib/main.py (modified) (4 diffs)
• gamelib/sound.py (modified) (5 diffs)

gamelib/engine.py

@@ -149 +149 @@
         elif e.type is KEYDOWN and e.key == K_ESCAPE:
             self.dialog = check_exit()
-        elif e.type is ANIM_ID:
-            self.game.gameboard.run_animations()
         elif e.type is KEYDOWN and e.key == K_n:
             return pygame.event.post(START_NIGHT)
@@ -213 +211 @@
         elif e.type is KEYDOWN and e.key == K_ESCAPE:
             self.dialog = check_exit()
-        elif e.type is ANIM_ID:
-            self.game.gameboard.run_animations()
         elif e.type is MOVE_FOX_ID:
             # ensure no timers trigger while we're running

gamelib/main.py

@@ -7 +7 @@
 '''
 
+import sys
+
 import pygame
 from pgu import gui
@@ -14 +16 @@
 from sound import init_sound
 import constants
+from config import config
 import data
-import sys
 
 def create_main_app(screen):
@@ -27 +29 @@
 def main():
     """Main script."""
+    config.configure(sys.argv[1:])
     init_sound()
     screen = pygame.display.set_mode(constants.SCREEN, SWSURFACE)
@@ -35 +38 @@
     from engine import Engine, MainMenuState
 
-    if len(sys.argv) > 1:
-        level_name = sys.argv[1]
-    else:
-        level_name = 'two_weeks'
-
-    engine = Engine(main_app, level_name)
+    engine = Engine(main_app, config.level_name)
     try:
         engine.run(MainMenuState(engine), screen)

gamelib/sound.py

@@ -1 +1 @@
 import os
-import pygame
 import sys
 
+import pygame
+
 import data
+from config import config
 import constants
 
@@ -11 +13 @@
     """initialize the sound system"""
     global SOUND_INITIALIZED
+    if not config.sound:
+        return
     try:
         pygame.mixer.init(constants.FREQ, constants.BITSIZE, constants.CHANNELS, constants.BUFFER)
@@ -21 +25 @@
 def play_sound(filename):
     """plays the sound with the given filename from the data sounds directory"""
-    if not SOUND_INITIALIZED:
+    if not (SOUND_INITIALIZED and config.sound):
         return
     file_path = data.filepath("sounds", filename)
@@ -36 +40 @@
     """stops any playing background music"""
     global CURRENT_MUSIC_FILE
-    if not SOUND_INITIALIZED:
+    if not (SOUND_INITIALIZED and config.sound):
         return
     CURRENT_MUSIC_FILE = None
@@ -45 +49 @@
     """plays the background music with the given filename from the data sounds directory"""
     global CURRENT_MUSIC_FILE
-    if not SOUND_INITIALIZED:
+    if not (SOUND_INITIALIZED and config.sound):
         return
     file_path = data.filepath("sounds", filename)