Changeset 772


Ignore:
Timestamp:
03/01/11 21:31:47 (8 years ago)
Author:
aspidites
Message:

Patch by Aspidites

  • finally got this rebasing thing down. sorry for the trouble guys
Location:
branches/active/character_customization/game
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/active/character_customization/game/parpg/settings.py

    r771 r772  
    9090        """ 
    9191        try: 
    92 <<<<<<< HEAD 
    9392            return dict((key, value[1:-1]) for (key, value) in  
    9493                        object.__getattribute__(self, option) if 
     
    9897        """ 
    9998        #return object.__getattribute__(self, option) 
    100 ======= 
    101             return self.__dict__[option] 
    102         except KeyError: 
    103             return None 
    104 >>>>>>> 3ed9b3f... Patch by Aspidites: 
    10599 
    106100    def options(self): 
     
    111105            options.pop('name') 
    112106 
    113         return options.keys() 
    114  
    115 <<<<<<< HEAD 
    116 ======= 
    117 #TODO: remember config filenames/paths 
    118 #TODO: remove hard-coded settings filename/path 
    119 >>>>>>> 3ed9b3f... Patch by Aspidites: 
     107        return options 
     108 
    120109class Settings(object): 
    121110    """ An object that represents a settings file, its sectons, 
     
    144133        """ 
    145134 
    146 <<<<<<< HEAD 
    147135        self.settings_file = '' 
    148136        self.paths = kwargs.get('paths', None) 
     
    153141        else: 
    154142            self.paths = '.' 
    155 ======= 
    156         self.config_file = '' 
    157  
    158         if hasattr(filenames, 'split'): 
    159             self.read(filenames) 
    160         else: 
    161             for filename in filenames: 
    162                 self.read(filename) 
    163 >>>>>>> 3ed9b3f... Patch by Aspidites: 
    164143 
    165144    def __getattr__(self, name): 
     
    276255         
    277256        return sections 
    278 <<<<<<< HEAD 
    279 ======= 
    280  
    281     # backward compatibility methods 
    282     def get(self, section, option, default=None): 
    283         """ Returns the value of the requested option located in the 
    284             requested section. 
    285  
    286             This method is provided strictly for backwards                    
    287             compatibility be deprecated in future versions. 
    288   
    289             @param section: the section in which the option is located in 
    290             @type section: string 
    291             @param option: the option being requested 
    292             @type section: string 
    293             @param default: the default value to return if a section's option 
    294                 is not defined 
    295             @type section: any valid object 
    296         """ 
    297         value = getattr(getattr(self, section), option) 
    298         if value is None and default is not None: 
    299             return default 
    300         else: 
    301             return value 
    302  
    303     def getScreenWidth(self): 
    304         return self.FIFE.ScreenWidth 
    305  
    306     def getScreenHeight(self): 
    307         return self.FIFE.ScreenHeight 
    308 >>>>>>> 3ed9b3f... Patch by Aspidites: 
  • branches/active/character_customization/game/settings.ini

    r771 r772  
    22VideoDriver = 
    33FullScreen = False 
    4 PlaySounds =  True 
     4PlaySounds = False 
    55RenderBackend = OpenGL 
    66ColorKey = [250, 0, 250] 
     
    1414WindowTitle = PARPG Demo 
    1515WindowIcon = gui/icons/window_icon.png 
    16 FontsDirectory = fonts/ 
     16Font = fonts/oldtypewriter.ttf 
    1717Font = fonts/oldtypewriter.ttf 
    1818FontsDirectory = fonts/ 
Note: See TracChangeset for help on using the changeset viewer.