# HG changeset patch # User Beliar # Date 1333909843 -7200 # Node ID 4381be70e1bb52fdacd7f49f1b8144d4b80b1d49 # Parent 2a12e2843984bae6b3b885b67cb22b87e5366701 Fixed incompatibility with latest changes to bgrease. diff -r 2a12e2843984 -r 4381be70e1bb charactercreationcontroller.py --- a/charactercreationcontroller.py Tue Mar 27 13:41:20 2012 +0200 +++ b/charactercreationcontroller.py Sun Apr 08 20:30:43 2012 +0200 @@ -77,7 +77,7 @@ @type application: L{fife.extensions.basicapplication.ApplicationBase}""" ControllerBase.__init__(self, engine, view, model, application) - PARPGWorld.__init__(self) + PARPGWorld.__init__(self, engine) self.settings = self.model.settings self.view.start_new_game_callback = self.startNewGame self.view.cancel_new_game_callback = self.cancelNewGame diff -r 2a12e2843984 -r 4381be70e1bb controllerbase.py --- a/controllerbase.py Tue Mar 27 13:41:20 2012 +0200 +++ b/controllerbase.py Sun Apr 08 20:30:43 2012 +0200 @@ -42,8 +42,7 @@ KeyListener.__init__(self, application.event_listener) MouseListener.__init__(self, application.event_listener) CommandListener.__init__(self, application.event_listener) - Mode.__init__(self) - self.engine = engine + Mode.__init__(self, engine) self.event_manager = engine.getEventManager() self.view = view self.model = model diff -r 2a12e2843984 -r 4381be70e1bb gamescenecontroller.py --- a/gamescenecontroller.py Tue Mar 27 13:41:20 2012 +0200 +++ b/gamescenecontroller.py Sun Apr 08 20:30:43 2012 +0200 @@ -73,7 +73,7 @@ view, model, application) - PARPGWorld.__init__(self) + PARPGWorld.__init__(self, engine) #setup functions for the GameEnvironment createItemByID = lambda identifier : ( diff -r 2a12e2843984 -r 4381be70e1bb world.py --- a/world.py Tue Mar 27 13:41:20 2012 +0200 +++ b/world.py Sun Apr 08 20:30:43 2012 +0200 @@ -9,8 +9,14 @@ class PARPGWorld(World): - def __init__(self): - World.__init__(self) + def __init__(self, engine): + ''' + Constructor + @param engine: Instance of the active fife engine + @type engine: fife.Engine + ''' + World.__init__(self, engine) + def configure(self): """Configure the game world's components, systems and renderers"""