Mercurial > parpg-source

diff gamescenecontroller.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: ab6a0fd1668a
children: 4381be70e1bb
--- a/gamescenecontroller.py	Sat Mar 24 09:59:46 2012 +0100
+++ b/gamescenecontroller.py	Tue Mar 27 13:41:20 2012 +0200
@@ -35,7 +35,7 @@
                             ExamineContentsAction,
                             )
 
-from parpg.world import World
+from parpg.world import PARPGWorld
 
 #For debugging/code analysis
 if False:
@@ -46,7 +46,7 @@
 
 logger = logging.getLogger('gamescenecontroller')
 
-class GameSceneController(World, ControllerBase):
+class GameSceneController(PARPGWorld, ControllerBase):
     '''
     This controller handles inputs when the game is in "scene" state.
     "Scene" state is when the player can move around and interact
@@ -73,7 +73,7 @@
                                 view,
                                 model,
                                 application)
-        World.__init__(self)
+        PARPGWorld.__init__(self)
 
         #setup functions for the GameEnvironment        
         createItemByID = lambda identifier : (
@@ -590,7 +590,7 @@
         if self.paused: 
             return
         ControllerBase.pump(self, dt)
-        World.pump(self, dt)
+        PARPGWorld.pump(self, dt)
         self.updateMouse()
         if self.model.active_map:
             self.view.highlightFrontObject(self.last_mousecoords)