Mercurial > parpg-source
changeset 189:4381be70e1bb tip
Fixed incompatibility with latest changes to bgrease.
| author | Beliar <KarstenBock@gmx.net> |
|---|---|
| date | Sun, 08 Apr 2012 20:30:43 +0200 |
| parents | 2a12e2843984 |
| children | |
| files | charactercreationcontroller.py controllerbase.py gamescenecontroller.py world.py |
| diffstat | 4 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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 : (
--- 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"""