comparison gamescenecontroller.py @ 160:75c0b728ccf3

Further work on the scripting system.
author KarstenBock@gmx.net
date Sun, 13 Nov 2011 17:19:14 +0100
parents 04854cf6e1ac
children d224bbce512a
comparison
equal deleted inserted replaced
159:1b66e1ce226b 160:75c0b728ccf3
71 engine, 71 engine,
72 view, 72 view,
73 model, 73 model,
74 application) 74 application)
75 World.__init__(self) 75 World.__init__(self)
76 self.systems.scripting.game_state = self.model.game_state
77
76 #this can be helpful for IDEs code analysis 78 #this can be helpful for IDEs code analysis
77 if False: 79 if False:
78 assert(isinstance(self.engine, fife.Engine)) 80 assert(isinstance(self.engine, fife.Engine))
79 assert(isinstance(self.view, GameSceneView)) 81 assert(isinstance(self.view, GameSceneView))
80 assert(isinstance(self.view, GameModel)) 82 assert(isinstance(self.view, GameModel))
561 # uncomment to instrument 563 # uncomment to instrument
562 # t0 = time.time() 564 # t0 = time.time()
563 if self.paused: 565 if self.paused:
564 return 566 return
565 ControllerBase.pump(self, dt) 567 ControllerBase.pump(self, dt)
568 World.pump(self, dt)
566 self.updateMouse() 569 self.updateMouse()
567 if self.model.active_map: 570 if self.model.active_map:
568 self.view.highlightFrontObject(self.last_mousecoords) 571 self.view.highlightFrontObject(self.last_mousecoords)
569 self.view.refreshTopLayerTransparencies() 572 self.view.refreshTopLayerTransparencies()
570 self.handleScrolling() 573 self.handleScrolling()