Changeset 796


Ignore:
Timestamp:
03/07/11 11:11:57 (9 years ago)
Author:
aspidites
Message:

Patch by Aspdites:

  • changed PlaySounds? references to EnableSound? for consistency
  • changed optionButton references to settingsButton for consistency
  • changed hud pause menu "Options" to "Settings" for consistency
Location:
branches/active/character_customization/game
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/active/character_customization/game/gui/hud_pause_menu.xml

    r648 r796  
    1111  <Button name="saveButton"    text="Save Game"   position="25,53" min_size="95,20" max_size="95,20"/> 
    1212  <Button name="loadButton"    text="Load Game"   position="25,76"  min_size="95,20" max_size="95,20"/> 
    13   <Button name="optionsButton" text="Options"     position="25,99" min_size="95,20" max_size="95,20"/> 
     13  <Button name="settingsButton" text="Settings"     position="25,99" min_size="95,20" max_size="95,20"/> 
    1414  <Button name="helpButton"    text="Help"        position="25,122" min_size="95,20" max_size="95,20" /> 
    1515  <Button name="quitButton"    text="Quit"        position="25,145" min_size="95,20" max_size="95,20" /> 
  • branches/active/character_customization/game/gui/main_menu.xml

    r783 r796  
    1515          <Button base_color="0,0,0,0" name="newButton" text="New Game" font="OldTypewriter"/> 
    1616          <Button base_color="0,0,0,0" name="loadButton" text="Load Game" font="OldTypewriter"/> 
    17           <Button base_color="0,0,0,0" name="optionsButton" text="Settings" font="OldTypewriter"/> 
     17          <Button base_color="0,0,0,0" name="settingsButton" text="Settings" font="OldTypewriter"/> 
    1818          <Button base_color="0,0,0,0" name="creditsButton" text="Credits" font="OldTypewriter"/> 
    1919                </VBox> 
  • branches/active/character_customization/game/parpg/gamescenecontroller.py

    r794 r796  
    8989        self.paused = False 
    9090 
    91         if model.settings.fife.PlaySounds: 
     91        if model.settings.fife.EnableSound: 
    9292            if not self.view.sounds.music_init: 
    9393                music_file = random.choice(glob.glob(os.path.join( 
  • branches/active/character_customization/game/parpg/gui/hud.py

    r774 r796  
    199199        #TODO: find more suitalbe place for onOptilonsPress implementation 
    200200        self.menu_events = {"resumeButton": self.hideMenu,  
    201                             "optionsButton": self.displaySettings, 
     201                            "settingsButton": self.displaySettings, 
    202202                            "helpButton": self.displayHelp} 
    203203        self.main_menu.mapEvents(self.menu_events) 
  • branches/active/character_customization/game/parpg/gui/menus.py

    r790 r796  
    8585        self.lighting_model = self.settings.fife.Lighting 
    8686        self.fullscreen = self.settings.fife.FullScreen 
    87         self.sound = self.settings.fife.PlaySounds 
     87        self.sound = self.settings.fife.EnableSound 
    8888 
    8989        self.window = pychan.loadXML('gui/settings_menu.xml') 
     
    138138        self.settings.fife.Lighting = self.lighting_models[lighting] 
    139139        self.settings.fife.FullScreen = fullscreen 
    140         self.settings.fife.PlaySounds = sound 
     140        self.settings.fife.EnableSound = sound 
    141141        self.settings.write() 
    142142        
  • branches/active/character_customization/game/parpg/mainmenuview.py

    r774 r796  
    6565        menu_events["newButton"] = self.newGame 
    6666        menu_events["loadButton"] = self.loadGame 
    67         menu_events["optionsButton"] = self.displaySettings 
     67        menu_events["settingsButton"] = self.displaySettings 
    6868        menu_events["quitButton"] = self.quitGame 
    6969        self.main_menu.mapEvents(menu_events) 
  • branches/active/character_customization/game/parpg/settings.py

    r795 r796  
    248248VideoDriver = 
    249249FullScreen = False 
    250 PlaySounds = False 
     250EnableSound = True 
    251251RenderBackend = OpenGL 
    252252ColorKey = [250, 0, 250] 
  • branches/active/character_customization/game/run.py

    r794 r796  
    2323parser = ArgumentParser(description='PARPG Launcher Script') 
    2424parser.add_argument('-s', '--settings', nargs='+', 
    25                     dest='filenames', metavar='filename', 
    26                     default='.', 
    27                     help='One or more files to load settings from') 
     25                    dest='paths', metavar='paths', 
     26                    default=['.'], 
     27                    help='One or more paths to load settings from') 
    2828parser.add_argument('-f', '--logfile', 
    2929                    help='Name of log file to save to') 
Note: See TracChangeset for help on using the changeset viewer.