changeset 25:baee049045be ornery-orc

Traipse 'OpenRPG' {090909-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: Fixes log problem in Fog. Fixes Mini Lib loading problem. Fixes problem with whispers in Alias Lib.
author sirebral
date Wed, 09 Sep 2009 16:59:20 -0500
parents 07ebe8916b7e
children 153def0822a8
files orpg/gametree/nodehandlers/minilib.py orpg/mapper/fog.py orpg/orpg_version.py orpg/tools/aliaslib.py
diffstat 4 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/gametree/nodehandlers/minilib.py	Sun Aug 30 18:10:15 2009 -0500
+++ b/orpg/gametree/nodehandlers/minilib.py	Wed Sep 09 16:59:20 2009 -0500
@@ -36,6 +36,7 @@
 import string
 import map_miniature_nodehandler
 import orpg.mapper.map_msg
+import orpg.minidom as minidom
 # import scriptkit
 
 # Constants
@@ -218,7 +219,7 @@
             label = mini.getAttribute( ATTRIBUTE_NAME )
         else:
             label = ''
-        return msg().get_all_xml()
+        return msg.get_all_xml()
 
     def is_unique( self, mini ):
         unique = mini.getAttribute( ATTRIBUTE_UNIQUE )
--- a/orpg/mapper/fog.py	Sun Aug 30 18:10:15 2009 -0500
+++ b/orpg/mapper/fog.py	Wed Sep 09 16:59:20 2009 -0500
@@ -33,6 +33,7 @@
 
 class FogArea:
     def __init__(self, outline, log):
+        self.log = log
         self.outline = outline
 
     def set_fog_props(self, str):
@@ -79,6 +80,7 @@
 class fog_layer(layer_base):
     def __init__(self, canvas):
         self.canvas = canvas
+        self.log = component.get('log')
         layer_base.__init__(self)
         self.color = wx.Color(128,128,128)
         if "__WXGTK__" not in wx.PlatformInfo: self.color = wx.Color(128,128,128, 128)
--- a/orpg/orpg_version.py	Sun Aug 30 18:10:15 2009 -0500
+++ b/orpg/orpg_version.py	Wed Sep 09 16:59:20 2009 -0500
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse"
 DIS_VER = "Ornery Orc"
-BUILD = "090830-00"
+BUILD = "090909-00
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"
--- a/orpg/tools/aliaslib.py	Sun Aug 30 18:10:15 2009 -0500
+++ b/orpg/tools/aliaslib.py	Wed Sep 09 16:59:20 2009 -0500
@@ -325,15 +325,16 @@
             defaultcolor = settings.get_setting("mytextcolor")
             settings.set_setting("mytextcolor", self.alias[1])
             self.chat.set_colors()
-        opts = []
+        opts = []; idlist = []
         myid = self.session.get_id()
         for p in players:
             if p[2] != myid: opts.append("(" + p[2] + ") " + self.chat.html_strip(p[0]))
+            if p[2] != myid: idlist.append(p[2])
         dlg = orpgMultiCheckBoxDlg(self, opts, "Select Players:", "Whisper To", [])
         sendto = []
         if dlg.ShowModal() == wx.ID_OK:
             selections = dlg.get_selections()
-            for s in selections: sendto.append(players[s][2])
+            for s in selections: sendto.append(idlist[s])
         line = self.textWnd.GetValue().replace("\n", "<br />")
         if self.checkFilterText.IsChecked() and self.filter != self.chat.defaultFilterName:
             for rule in self.filterRegEx: line = re.sub(rule[0], rule[1], line)