Changeset 574 for trunk/game/scripts/gamemodel.py

Timestamp:

07/08/10 18:00:37 (9 years ago)

Author:

beliar

Message:

Patch by Beliar:

• Quest states are now saved and restored too
• People met are now restored from saves too (there where saved before but not restored)

Note that old savegames are not working anymore.

File:

• trunk/game/scripts/gamemodel.py (modified) (4 diffs)

trunk/game/scripts/gamemodel.py

@@ -27 +27 @@
 from common.utils import parseBool
 from inventory import Inventory
-from scripts.quest_engine import QuestEngine
 
 try:
@@ -55 +54 @@
         self.load_saver = False
         self.savegame = None
-        self.game_state = GameState()
-        self.game_state.quest_engine = QuestEngine(\
-                                            settings.get("PARPG",
-                                                         "QuestsDirectory"))
-        self.game_state.quest_engine.readQuests()
+        self.game_state = GameState(QuestsDir = settings.get("PARPG",
+                                                             "QuestsDirectory"))
+        #self.game_state.quest_engine = 
+        #self.game_state.quest_engine.readQuests()
         self.pc_run = 1
         self.target_position = None
@@ -497 +495 @@
         self.active_map.addPC()
         self.game_state.PlayerCharacter.start()
+        if agent.has_key("PeopleKnown"):
+            self.game_state.PlayerCharacter.peopleIknow = agent["PeopleKnown"]
                       
     def changeMap(self, map_name, target_position = None):
@@ -513 +513 @@
             # issue the map change
             self.map_change = True
-        else:
-            #set the player position on the current map
-            self.teleport(target_position)
 
     def deleteMaps(self):