Changeset 627 for trunk/game/scripts/objects

Timestamp:

08/06/10 08:45:53 (9 years ago)

Author:

beliar

Message:

Patch by Beliar.

• Added SettingsVersion? to settings. This contains the version (currently a date of the last change) of the settings. The version will be checked with the version in settings-dist.xml and if the versions don't match the settings.xml file will be renamed to settings-old.xml. The version string has to be set manually when editing settings-dist.xml.

File:

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

trunk/game/scripts/objects/actors.py

@@ -16 +16 @@
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
 
+from random import randrange
+
+
 from fife import fife
+
 from base import GameObject, Living, Scriptable, CharStats
-from fife.extensions.fife_settings import Setting
 from composed import CarryableItem
 from scripts.inventory import Inventory
-from random import randrange
+from scripts.common.utils import loadSettings
 
 """All actors go here. Concrete classes only."""
@@ -27 +30 @@
 __all__ = ["PlayerCharacter", "NonPlayerCharacter",]
 
-TDS = Setting(app_name="PARPG",
-              settings_file="./settings.xml", 
-              settings_gui_xml="")
+Settings = loadSettings()
+
 _AGENT_STATE_NONE, _AGENT_STATE_IDLE, _AGENT_STATE_APPROACH, _AGENT_STATE_RUN, _AGENT_STATE_WANDER, _AGENT_STATE_TALK = xrange(6)
 
@@ -51 +53 @@
         self.state = _AGENT_STATE_NONE
         # TODO: rework/improve
-        self.speed = TDS.get("PARPG", "PCSpeed")-1
+        self.speed = Settings.get("PARPG", "PCSpeed")-1
         
     def getX(self):
@@ -89 +91 @@
         self.idle_counter = 1
         # TODO: rework/improve
-        self.speed = TDS.get("PARPG", "PCSpeed")
+        self.speed = Settings.get("PARPG", "PCSpeed")
         self.nextAction = None
         self.agent = None