diff charactercreationcontroller.py @ 188:2a12e2843984

Removed bGrease, which is in a seperate repository, here: https://github.com/Beliaar/bGrease
author Beliar <KarstenBock@gmx.net>
date Tue, 27 Mar 2012 13:41:20 +0200
parents b3b82c2aebee
children 4381be70e1bb
line wrap: on
line diff
--- a/charactercreationcontroller.py	Sat Mar 24 09:59:46 2012 +0100
+++ b/charactercreationcontroller.py	Tue Mar 27 13:41:20 2012 +0200
@@ -19,7 +19,7 @@
 from controllerbase import ControllerBase
 from gamescenecontroller import GameSceneController
 from gamesceneview import GameSceneView
-from parpg.world import World
+from parpg.world import PARPGWorld
 from parpg.entities import General
 from parpg.components import character_statistics
 
@@ -50,7 +50,7 @@
     else:
         return 10    
             
-class CharacterCreationController(ControllerBase, World):
+class CharacterCreationController(ControllerBase, PARPGWorld):
     """Controller defining the behaviour of the character creation screen."""
     
     #TODO: Change to actual values
@@ -77,7 +77,7 @@
            @type application: 
                L{fife.extensions.basicapplication.ApplicationBase}"""
         ControllerBase.__init__(self, engine, view, model, application)
-        World.__init__(self)
+        PARPGWorld.__init__(self)
         self.settings = self.model.settings
         self.view.start_new_game_callback = self.startNewGame
         self.view.cancel_new_game_callback = self.cancelNewGame