Mercurial > parpg-core
comparison src/parpg/gui/hud.py @ 69:ad75fa042b99
Changes to make PARPG "runable" with grease. (With the correct modified assets)
author | KarstenBock@gmx.net |
---|---|
date | Tue, 06 Sep 2011 15:22:51 +0200 |
parents | d60f1dab8469 |
children | 2e307c4f78e3 |
comparison
equal
deleted
inserted
replaced
68:d7286cba42df | 69:ad75fa042b99 |
---|---|
161 # inv_callbacks = { | 161 # inv_callbacks = { |
162 # 'refreshReadyImages': self.refreshReadyImages, | 162 # 'refreshReadyImages': self.refreshReadyImages, |
163 # 'toggleInventoryButton': self.toggleInventoryButton, | 163 # 'toggleInventoryButton': self.toggleInventoryButton, |
164 # } | 164 # } |
165 # self.inventory_storage = \ | 165 # self.inventory_storage = \ |
166 # self.model.game_state.player_character.inventory | 166 # self.model.game_state.getObjectById("PlayerCharacter").fifeagent.inventory |
167 # if self.inventory == None: | 167 # if self.inventory == None: |
168 # self.inventory = inventorygui.InventoryGUI(self.controller, | 168 # self.inventory = inventorygui.InventoryGUI(self.controller, |
169 # self.inventory_storage, | 169 # self.inventory_storage, |
170 # inv_callbacks) | 170 # inv_callbacks) |
171 # else: | 171 # else: |
506 self.stopActions() | 506 self.stopActions() |
507 dialogue = DialogueGUI( | 507 dialogue = DialogueGUI( |
508 self.controller, | 508 self.controller, |
509 npc, | 509 npc, |
510 self.model.game_state.quest_engine, | 510 self.model.game_state.quest_engine, |
511 self.model.game_state.player_character) | 511 self.model.game_state.getObjectById("PlayerCharacter").fifeagent) |
512 return dialogue | 512 return dialogue |