openrpg-dev — Developer mailing list for OpenRPG1 (Python)

[Openrpg-dev] openrpg1/orpg/mapper fog.py,1.30,1.31

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12191/orpg/mapper

Modified Files:
	fog.py 
Log Message:


Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** fog.py	9 Mar 2007 14:40:25 -0000	1.30
--- fog.py	9 Mar 2007 14:46:00 -0000	1.31
***************
*** 234,238 ****
                  gc.SetBrush(wx.Brush(self.color))
  
-             print topleft
              rgn = wx.Region(0, 0, self.canvas.size[0]+2, self.canvas.size[1]+2)
              if not self.fogregion.IsEmpty():
--- 234,237 ----

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.105,1.106

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10220/orpg

Modified Files:
	orpg_version.py 
Log Message:


Index: orpg_version.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** orpg_version.py	3 Mar 2007 00:34:58 -0000	1.105
--- orpg_version.py	9 Mar 2007 14:40:56 -0000	1.106
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070302-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070309-00"
  
  

[Openrpg-dev] openrpg1/orpg/mapper fog.py,1.29,1.30

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10174/orpg/mapper

Modified Files:
	fog.py 
Log Message:


Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** fog.py	9 Mar 2007 14:11:55 -0000	1.29
--- fog.py	9 Mar 2007 14:40:25 -0000	1.30
***************
*** 131,135 ****
          self.use_fog = False
          self.last_role = ""
-         self.isUpdated = False
  
          self.log.log("Exit fog_layer", ORPG_DEBUG)
--- 131,134 ----
***************
*** 140,144 ****
          self.fogregion.Clear()
          self.use_fog = True
-         self.isUpdated = True
          self.del_area("all")
          self.recompute_fog()
--- 139,142 ----
***************
*** 151,155 ****
          self.fogregion.Clear()
          self.use_fog = False
-         self.isUpdated = True
          self.del_area("all")
          self.add_area("none")
--- 149,152 ----

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.98.2.4,1.98.2.5

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6726/orpg

Modified Files:
      Tag: BRANCH-1-7-1
	orpg_version.py 
Log Message:


Index: orpg_version.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v
retrieving revision 1.98.2.4
retrieving revision 1.98.2.5
diff -C2 -d -r1.98.2.4 -r1.98.2.5
*** orpg_version.py	1 Mar 2007 22:05:57 -0000	1.98.2.4
--- orpg_version.py	9 Mar 2007 14:32:14 -0000	1.98.2.5
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070226-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070309-00"
  
  

[Openrpg-dev] openrpg1/orpg/mapper background.py, 1.27.2.1, 1.27.2.2 background_handler.py, 1.21, 1.21.2.1 base_msg.py, 1.8, 1.8.2.1 fog.py, 1.27, 1.27.2.1 grid.py, 1.24, 1.24.2.1 grid_handler.py, 1.18, 1.18.2.1 map_msg.py, 1.15, 1.15.2.1 miniatures.py, 1.41.2.1, 1.41.2.2 miniatures_handler.py, 1.36, 1.36.2.1 whiteboard.py, 1.46, 1.46.2.1 whiteboard_handler.py, 1.36, 1.36.2.1 whiteboard_msg.py, 1.11, 1.11.2.1

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5841/orpg/mapper

Modified Files:
      Tag: BRANCH-1-7-1
	background.py background_handler.py base_msg.py fog.py grid.py 
	grid_handler.py map_msg.py miniatures.py miniatures_handler.py 
	whiteboard.py whiteboard_handler.py whiteboard_msg.py 
Log Message:
Fixed Problems with multiple people moving miniatures
Fixed Local minis always labeled
Fixed Lines disappearing randomly - Hopefully
Removed the Popup box for map sync errors

Index: miniatures_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures_handler.py,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -d -r1.36 -r1.36.2.1
*** miniatures_handler.py	12 Feb 2007 02:29:08 -0000	1.36
--- miniatures_handler.py	9 Mar 2007 14:30:46 -0000	1.36.2.1
***************
*** 343,346 ****
--- 343,347 ----
                  self.sel_min.pos = cmpPoint(int(pos.x),int(pos.y))
              self.sel_min.selected = False
+             self.sel_min.isUpdated = True
              self.sel_min = None
              self.canvas.Refresh(False)

Index: grid.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid.py,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** grid.py	11 Nov 2006 22:38:42 -0000	1.24
--- grid.py	9 Mar 2007 14:30:46 -0000	1.24.2.1
***************
*** 70,73 ****
--- 70,75 ----
          self.layerDraw = self.draw_rect
  
+         self.isUpdated = True
+ 
      def get_unit_size(self):
          return self.unit_size
***************
*** 463,467 ****
          xml_str += "/>"
  
!         return xml_str
  
  
--- 465,473 ----
          xml_str += "/>"
  
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
  

Index: whiteboard_msg.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/whiteboard_msg.py,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** whiteboard_msg.py	4 Nov 2006 21:24:21 -0000	1.11
--- whiteboard_msg.py	9 Mar 2007 14:30:47 -0000	1.11.2.1
***************
*** 134,138 ****
  
                  try:
-                     print "setting from dom"
                      item.set_from_dom(c)
                  except Exception, e:
--- 134,137 ----

Index: map_msg.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/map_msg.py,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** map_msg.py	4 Nov 2006 21:24:21 -0000	1.15
--- map_msg.py	9 Mar 2007 14:30:46 -0000	1.15.2.1
***************
*** 56,62 ****
  
  
- 
- 
- 
      def init_from_dom(self,xml_dom):
          self.p_lock.acquire()
--- 56,59 ----
***************
*** 65,75 ****
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map":
!                 if xml_dom.getAttributeKeys():
!                     for k in xml_dom.getAttributeKeys():
!                         if k == "action" and xml_dom.getAttribute( k ) == "new":
!                             #print "******* Resetting all map attributes for a new map load..."
!                             self.clear()
!                             #print "******* Old map has been cleared...loading new map..."
  
              # Process all of the properties in each tag
--- 62,67 ----
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map" and xml_dom.hasAttribute("action") and xml_dom.getAttribute("action") == "new":
!                 self.clear()
  
              # Process all of the properties in each tag
***************
*** 80,86 ****
  
              for c in xml_dom._get_childNodes():
- 
                  name = c._get_nodeName()
- 
                  if not self.children.has_key(name):
                      if name == "miniatures":
--- 72,76 ----
***************
*** 121,131 ****
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map":
!                 if xml_dom.getAttributeKeys():
!                     for k in xml_dom.getAttributeKeys():
!                         if k == "action" and xml_dom.getAttribute( k ) == "new":
!                             #print "******* Resetting all map attributes for a new map load..."
!                             self.clear()
!                             #print "******* Old map has been cleared...loading new map..."
  
              # Process all of the properties in each tag
--- 111,116 ----
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map" and xml_dom.hasAttribute("action") and xml_dom.getAttribute("action") == "new":
!                 self.clear()
  
              # Process all of the properties in each tag
***************
*** 136,142 ****
  
              for c in xml_dom._get_childNodes():
- 
                  name = c._get_nodeName()
- 
                  if not self.children.has_key(name):
                      if name == "miniatures":
--- 121,125 ----
***************
*** 145,155 ****
                      elif name == "grid":
                          self.children[name] = grid_msg(self.p_lock)
                      elif name == "bg":
                          self.children[name] = bg_msg(self.p_lock)
                      elif name == "whiteboard":
                          self.children[name] = whiteboard_msg(self.p_lock)
!                         print "set_from dom msg", self.children[name]
                      elif name == "fog":
                          self.children[name] = fog_msg(self.p_lock)
                      else:
                          print "Unrecognized tag " + name + " found in map_msg.init_from_dom - skipping"
--- 128,141 ----
                      elif name == "grid":
                          self.children[name] = grid_msg(self.p_lock)
+ 
                      elif name == "bg":
                          self.children[name] = bg_msg(self.p_lock)
+ 
                      elif name == "whiteboard":
                          self.children[name] = whiteboard_msg(self.p_lock)
! 
                      elif name == "fog":
                          self.children[name] = fog_msg(self.p_lock)
+ 
                      else:
                          print "Unrecognized tag " + name + " found in map_msg.init_from_dom - skipping"
***************
*** 170,176 ****
  
  
!     def get_all_xml(self,action="new",output_action=1):
!         return map_element_msg_base.get_all_xml(self,action,output_action)
  
!     def get_changed_xml(self,action="update",output_action=1):
!         return map_element_msg_base.get_changed_xml(self,action,output_action)
--- 156,162 ----
  
  
!     def get_all_xml(self, action="new", output_action=1):
!         return map_element_msg_base.get_all_xml(self, action, output_action)
  
!     def get_changed_xml(self, action="update", output_action=1):
!         return map_element_msg_base.get_changed_xml(self, action, output_action)

Index: grid_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid_handler.py,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** grid_handler.py	12 Feb 2007 02:29:08 -0000	1.18
--- grid_handler.py	9 Mar 2007 14:30:46 -0000	1.18.2.1
***************
*** 72,75 ****
--- 72,76 ----
          self.color_button.SetBackgroundColour(layer.get_color())
          self.grid_snap.SetValue(layer.is_snap())
+         layer.isUpdated = True
  
      def build_menu(self,label = "Grid"):

Index: background.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/background.py,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -d -r1.27.2.1 -r1.27.2.2
*** background.py	20 Feb 2007 10:17:45 -0000	1.27.2.1
--- background.py	9 Mar 2007 14:30:46 -0000	1.27.2.2
***************
*** 79,82 ****
--- 79,83 ----
          self.localPath = ''
          self.localTime = -1
+         self.isUpdated = True
  
  
***************
*** 114,117 ****
--- 115,120 ----
          self.log.log("Enter layer_back_ground->set_texture(self, path)", ORPG_DEBUG)
  
+         self.isUpdated = True
+ 
          self.type = BG_TEXTURE
          if self.img_path != path:
***************
*** 130,133 ****
--- 133,138 ----
          self.log.log("Enter layer_back_ground->set_image(self, path, scale)", ORPG_DEBUG)
  
+         self.isUpdated = True
+ 
          self.type = BG_IMAGE
          if self.img_path != path:
***************
*** 147,150 ****
--- 152,157 ----
          self.log.log("Enter layer_back_ground->set_color(self, color)", ORPG_DEBUG)
  
+         self.isUpdated = True
+ 
          self.type = BG_COLOR
          (r,g,b) = color.Get()
***************
*** 292,296 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit layer_back_ground->layerToXML(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
  
--- 299,308 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit layer_back_ground->layerToXML(self, " + action + ")", ORPG_DEBUG)
! 
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
  

Index: background_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/background_handler.py,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** background_handler.py	12 Feb 2007 02:29:08 -0000	1.21
--- background_handler.py	9 Mar 2007 14:30:46 -0000	1.21.2.1
***************
*** 42,46 ****
          self.lock = Lock()
  
!         self.bg_type = wx.Choice(self, wx.ID_ANY, choices = ["None", "Texture", "Image", "Color" ])
          self.localBrowse = wx.Button(self, wx.ID_ANY, 'Browse')
          self.localBrowse.Hide()
--- 42,47 ----
          self.lock = Lock()
  
!         self.bg_type = wx.Choice(self, wx.ID_ANY, choices = ["Texture", "Image", "Color" ])
!         self.bg_type.SetSelection(2)
          self.localBrowse = wx.Button(self, wx.ID_ANY, 'Browse')
          self.localBrowse.Hide()
***************
*** 89,95 ****
          session=self.canvas.frame.session
          if (session.my_role() != session.ROLE_GM):
!             self.url_path.Show(False)
          else:
!             self.url_path.Show(True)
              self.url_path.Enable(BG_COLOR!=bg_type)
          self.color_button.SetBackgroundColour(self.canvas.layers['bg'].get_color())
--- 90,96 ----
          session=self.canvas.frame.session
          if (session.my_role() != session.ROLE_GM):
!             self.url_path.Hide()
          else:
!             self.url_path.Show()
              self.url_path.Enable(BG_COLOR!=bg_type)
          self.color_button.SetBackgroundColour(self.canvas.layers['bg'].get_color())
***************
*** 135,144 ****
          self.canvas.layers['bg'].set_color(self.color_button.GetBackgroundColour())
  
!         index = self.bg_type.GetSelection()
!         if index == 0:
!             self.canvas.layers['bg'].clear()
!         elif index == 1:
              self.canvas.layers['bg'].set_texture(self.url_path.GetValue())
!         elif index == 2:
              self.size = self.canvas.layers['bg'].set_image(self.url_path.GetValue(),1)
  
--- 136,142 ----
          self.canvas.layers['bg'].set_color(self.color_button.GetBackgroundColour())
  
!         if self.bg_type.GetStringSelection() == 'Texture':
              self.canvas.layers['bg'].set_texture(self.url_path.GetValue())
!         elif self.bg_type.GetStringSelection() == 'Image':
              self.size = self.canvas.layers['bg'].set_image(self.url_path.GetValue(),1)
  

Index: whiteboard.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/whiteboard.py,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -C2 -d -r1.46 -r1.46.2.1
*** whiteboard.py	9 Feb 2007 00:37:17 -0000	1.46
--- whiteboard.py	9 Mar 2007 14:30:46 -0000	1.46.2.1
***************
*** 76,79 ****
--- 76,81 ----
          self.highlight_color = self.r_h.hexstring(r^255, g^255, b^255)
  
+         self.isUpdated = False
+ 
          self.log.log("Exit WhiteboardText", ORPG_DEBUG)
  
***************
*** 101,104 ****
--- 103,108 ----
          self.font.SetWeight(self.weight)
  
+         self.isUpdated = True
+ 
          self.log.log("Exit WhiteboardText->set_text_props(self, text_string, style, point, weight, color)", ORPG_DEBUG)
  
***************
*** 186,190 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
      def takedom(self, xml_dom):
--- 190,199 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
! 
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
      def takedom(self, xml_dom):
***************
*** 371,375 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
      def takedom(self, xml_dom):
--- 380,387 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
!         if action == "new":
!             return xml_str
! 
!         return ''
  
      def takedom(self, xml_dom):
***************
*** 683,687 ****
                  white_string += l.toxml(action)
  
!         if white_string:
              s = "<whiteboard"
              s += " serial='" + str(self.serial_number) + "'"
--- 695,699 ----
                  white_string += l.toxml(action)
  
!         if len(white_string):
              s = "<whiteboard"
              s += " serial='" + str(self.serial_number) + "'"

Index: miniatures.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures.py,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -C2 -d -r1.41.2.1 -r1.41.2.2
*** miniatures.py	20 Feb 2007 10:17:45 -0000	1.41.2.1
--- miniatures.py	9 Mar 2007 14:30:46 -0000	1.41.2.2
***************
*** 110,113 ****
--- 110,114 ----
          self.top = 0
          self.bottom = bmp.GetHeight()
+         self.isUpdated = False
  
          self.log.log("Exit BmpMiniature", ORPG_DEBUG)
***************
*** 145,148 ****
--- 146,151 ----
          self.height = height
  
+         self.isUpdated = True
+ 
          self.log.log("Exit BmpMiniature->set_min_props(self, heading, face, label, locked, hide, width, height)", ORPG_DEBUG)
  
***************
*** 481,485 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit BmpMiniature->toxml(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
      def takedom(self, xml_dom):
--- 484,493 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit BmpMiniature->toxml(self, " + action + ")", ORPG_DEBUG)
! 
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
      def takedom(self, xml_dom):
***************
*** 766,770 ****
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     wx.MessageBox("Deletion of unknown mini attempted","Map Synchronization Error")
  
  
--- 774,778 ----
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     #wx.MessageBox("Deletion of unknown mini attempted","Map Synchronization Error")
  
  
***************
*** 830,834 ****
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     wx.MessageBox("Update of unknown mini attempted","Map Synchronization Error")
  
  
--- 838,842 ----
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     #wx.MessageBox("Update of unknown mini attempted","Map Synchronization Error")
  
  
***************
*** 851,855 ****
                  if not modify:
                      start = path.rfind("/") + 1
!                     min_label = path[start:len(path)-4]
  
                      id = 'mini-' + self.canvas.frame.session.get_next_id()
--- 859,867 ----
                  if not modify:
                      start = path.rfind("/") + 1
! 
!                     if self.canvas.parent.layer_handlers[2].auto_label:
!                         min_label = path[start:len(path)-4]
!                     else:
!                         min_label = ""
  
                      id = 'mini-' + self.canvas.frame.session.get_next_id()

Index: whiteboard_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/whiteboard_handler.py,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -d -r1.36 -r1.36.2.1
*** whiteboard_handler.py	9 Feb 2007 00:37:17 -0000	1.36
--- whiteboard_handler.py	9 Mar 2007 14:30:46 -0000	1.36.2.1
***************
*** 190,193 ****
--- 190,194 ----
          self.text_properties_dialog.Show(False)
          self.text_selected_item.selected = False
+         self.text_selected_item.isUpdated = True
          self.text_selected_item = None
  

Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** fog.py	12 Feb 2007 02:29:08 -0000	1.27
--- fog.py	9 Mar 2007 14:30:46 -0000	1.27.2.1
***************
*** 155,171 ****
          self.log.log("Exit fog_layer->remove_fog(self)", ORPG_DEBUG)
  
-     def showall(self):
-         self.log.log("Enter fog_layer->showall(self)", ORPG_DEBUG)
- 
-         if self.fogregion.GetBox().GetWidth()==0:
-             self.fogregion= wx.Region(0,0,self.width,self.height)
-         else:
-             self.fogregion.Union(0,0,self.width,self.height)
-         self.use_fog = True
-         self.add_area("all")
-         self.fill_fog()
- 
-         self.log.log("Exit fog_layer->showall(self)", ORPG_DEBUG)
- 
      def resize(self, size):
          self.log.log("Enter fog_layer->resize(self, size)", ORPG_DEBUG)
--- 155,158 ----
***************
*** 287,293 ****
              area += str(i.X) + "," + str(i.Y)
  
-         ###HACK AROUND A wxPython BUG! for wxRegion::IsEmpty()
          if mode == 'new':
!             if self.fogregion.GetBox().GetWidth() == 0:
                  self.fogregion = regn
              else:
--- 274,279 ----
              area += str(i.X) + "," + str(i.Y)
  
          if mode == 'new':
!             if self.fogregion.IsEmpty():
                  self.fogregion = regn
              else:
***************
*** 295,299 ****
              self.add_area(area, show)
          else:
!             if self.fogregion.GetBox().GetWidth() > 0:
                  self.fogregion.SubtractRegion(regn)
              self.del_area(area, show)
--- 281,285 ----
              self.add_area(area, show)
          else:
!             if not self.fogregion.IsEmpty():
                  self.fogregion.SubtractRegion(regn)
              self.del_area(area, show)
***************
*** 317,328 ****
          list = IRegion().scan_Convert(polypt)
  
!         ###HACK AROUND A wxPython BUG! for wxRegion::IsEmpty()
!         loop = 0
          for i in list:
!             if loop == 0:
                  regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
                  regn.Union(i.left, i.y, i.right+1-i.left, 1)
-             loop += 1
  
          self.log.log("Exit fog_layer->scanConvert(self, polypt)", ORPG_DEBUG)
--- 303,312 ----
          list = IRegion().scan_Convert(polypt)
  
! 
          for i in list:
!             if regn.IsEmpty():
                  regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
                  regn.Union(i.left, i.y, i.right+1-i.left, 1)
  
          self.log.log("Exit fog_layer->scanConvert(self, polypt)", ORPG_DEBUG)

Index: base_msg.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/base_msg.py,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** base_msg.py	4 Nov 2006 21:24:21 -0000	1.8
--- base_msg.py	9 Mar 2007 14:30:46 -0000	1.8.2.1
***************
*** 78,87 ****
      def init_prop(self,prop,value):  # set's the changed flag to False and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value,0)
          self.p_lock.release()
  
      def set_prop(self,prop,value):  # set's the changed flag to True and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value,1)
          self.p_lock.release()
  
--- 78,87 ----
      def init_prop(self,prop,value):  # set's the changed flag to False and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value, 0)
          self.p_lock.release()
  
      def set_prop(self,prop,value):  # set's the changed flag to True and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value, 1)
          self.p_lock.release()
  
***************
*** 96,102 ****
              return None
  
- 
- 
- 
      def is_prop_changed(self,prop):  # returns None if prop not found
          self.p_lock_acquire()
--- 96,99 ----
***************
*** 204,208 ****
          for k in self._props.keys():
              (p,c) = self._props[k]
!             if k <> "id":  # don't duplicate the id attribute
                  xml_str += " " + k + "='" + p + "'"
  
--- 201,205 ----
          for k in self._props.keys():
              (p,c) = self._props[k]
!             if (k != "id" or k != "action") and c == 1:  # don't duplicate the id attribute
                  xml_str += " " + k + "='" + p + "'"
  
***************
*** 263,269 ****
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             if len(node_list) > 1:
!                 print "Found more than one instance of <" + self.tagname + "/>.  Taking first one"
!             self.init_from_dom(node_list[0])
  
          if xml_dom:
--- 260,265 ----
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             while len(node_list):
!                 self.init_from_dom(node_list.pop())
  
          if xml_dom:
***************
*** 277,283 ****
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             if len(node_list) > 1:
!                 print "Found more than one instance of <" + self.tagname + "/>.  Taking first one"
!             self.set_from_dom(node_list[0])
  
  
--- 273,278 ----
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             while len(node_list):
!                 self.set_from_dom(node_list.pop())
  
  

[Openrpg-dev] openrpg1/orpg/mapper background_handler.py, 1.22, 1.23

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32743/orpg/mapper

Modified Files:
	background_handler.py 
Log Message:


Index: background_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/background_handler.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** background_handler.py	9 Mar 2007 14:11:55 -0000	1.22
--- background_handler.py	9 Mar 2007 14:17:15 -0000	1.23
***************
*** 90,96 ****
          session=self.canvas.frame.session
          if (session.my_role() != session.ROLE_GM):
!             self.url_path.Disable()
          else:
!             self.url_path.Enable()
              self.url_path.Enable(BG_COLOR!=bg_type)
          self.color_button.SetBackgroundColour(self.canvas.layers['bg'].get_color())
--- 90,96 ----
          session=self.canvas.frame.session
          if (session.my_role() != session.ROLE_GM):
!             self.url_path.Hide()
          else:
!             self.url_path.Show()
              self.url_path.Enable(BG_COLOR!=bg_type)
          self.color_button.SetBackgroundColour(self.canvas.layers['bg'].get_color())

[Openrpg-dev] openrpg1/orpg/mapper background.py, 1.28, 1.29 background_handler.py, 1.21, 1.22 base_msg.py, 1.8, 1.9 fog.py, 1.28, 1.29 fog_handler.py, 1.13, 1.14 grid.py, 1.24, 1.25 grid_handler.py, 1.18, 1.19 map_msg.py, 1.15, 1.16 miniatures.py, 1.42, 1.43 miniatures_handler.py, 1.36, 1.37 whiteboard.py, 1.46, 1.47 whiteboard_handler.py, 1.36, 1.37 whiteboard_msg.py, 1.11, 1.12

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30233/orpg/mapper

Modified Files:
	background.py background_handler.py base_msg.py fog.py 
	fog_handler.py grid.py grid_handler.py map_msg.py 
	miniatures.py miniatures_handler.py whiteboard.py 
	whiteboard_handler.py whiteboard_msg.py 
Log Message:
Fixed Problems with multiple people moving miniatures
Fixed Local minis always labeled
Fixed Lines disappearing randomly - Hopefully
Removed the Popup box for map sync errors
Added some diff experimental fog code that will hopefully get OSX working.

Index: miniatures_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures_handler.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** miniatures_handler.py	12 Feb 2007 02:29:08 -0000	1.36
--- miniatures_handler.py	9 Mar 2007 14:11:55 -0000	1.37
***************
*** 343,346 ****
--- 343,347 ----
                  self.sel_min.pos = cmpPoint(int(pos.x),int(pos.y))
              self.sel_min.selected = False
+             self.sel_min.isUpdated = True
              self.sel_min = None
              self.canvas.Refresh(False)

Index: grid.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** grid.py	11 Nov 2006 22:38:42 -0000	1.24
--- grid.py	9 Mar 2007 14:11:55 -0000	1.25
***************
*** 70,73 ****
--- 70,75 ----
          self.layerDraw = self.draw_rect
  
+         self.isUpdated = True
+ 
      def get_unit_size(self):
          return self.unit_size
***************
*** 463,467 ****
          xml_str += "/>"
  
!         return xml_str
  
  
--- 465,473 ----
          xml_str += "/>"
  
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
  

Index: whiteboard_msg.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/whiteboard_msg.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** whiteboard_msg.py	4 Nov 2006 21:24:21 -0000	1.11
--- whiteboard_msg.py	9 Mar 2007 14:11:56 -0000	1.12
***************
*** 134,138 ****
  
                  try:
-                     print "setting from dom"
                      item.set_from_dom(c)
                  except Exception, e:
--- 134,137 ----

Index: map_msg.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/map_msg.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** map_msg.py	4 Nov 2006 21:24:21 -0000	1.15
--- map_msg.py	9 Mar 2007 14:11:55 -0000	1.16
***************
*** 56,62 ****
  
  
- 
- 
- 
      def init_from_dom(self,xml_dom):
          self.p_lock.acquire()
--- 56,59 ----
***************
*** 65,75 ****
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map":
!                 if xml_dom.getAttributeKeys():
!                     for k in xml_dom.getAttributeKeys():
!                         if k == "action" and xml_dom.getAttribute( k ) == "new":
!                             #print "******* Resetting all map attributes for a new map load..."
!                             self.clear()
!                             #print "******* Old map has been cleared...loading new map..."
  
              # Process all of the properties in each tag
--- 62,67 ----
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map" and xml_dom.hasAttribute("action") and xml_dom.getAttribute("action") == "new":
!                 self.clear()
  
              # Process all of the properties in each tag
***************
*** 80,86 ****
  
              for c in xml_dom._get_childNodes():
- 
                  name = c._get_nodeName()
- 
                  if not self.children.has_key(name):
                      if name == "miniatures":
--- 72,76 ----
***************
*** 121,131 ****
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map":
!                 if xml_dom.getAttributeKeys():
!                     for k in xml_dom.getAttributeKeys():
!                         if k == "action" and xml_dom.getAttribute( k ) == "new":
!                             #print "******* Resetting all map attributes for a new map load..."
!                             self.clear()
!                             #print "******* Old map has been cleared...loading new map..."
  
              # Process all of the properties in each tag
--- 111,116 ----
              # If this is a map message, look for the "action=new"
              # Notice we only do this when the root is a map tag
!             if self.tagname == "map" and xml_dom.hasAttribute("action") and xml_dom.getAttribute("action") == "new":
!                 self.clear()
  
              # Process all of the properties in each tag
***************
*** 136,142 ****
  
              for c in xml_dom._get_childNodes():
- 
                  name = c._get_nodeName()
- 
                  if not self.children.has_key(name):
                      if name == "miniatures":
--- 121,125 ----
***************
*** 145,155 ****
                      elif name == "grid":
                          self.children[name] = grid_msg(self.p_lock)
                      elif name == "bg":
                          self.children[name] = bg_msg(self.p_lock)
                      elif name == "whiteboard":
                          self.children[name] = whiteboard_msg(self.p_lock)
!                         print "set_from dom msg", self.children[name]
                      elif name == "fog":
                          self.children[name] = fog_msg(self.p_lock)
                      else:
                          print "Unrecognized tag " + name + " found in map_msg.init_from_dom - skipping"
--- 128,141 ----
                      elif name == "grid":
                          self.children[name] = grid_msg(self.p_lock)
+ 
                      elif name == "bg":
                          self.children[name] = bg_msg(self.p_lock)
+ 
                      elif name == "whiteboard":
                          self.children[name] = whiteboard_msg(self.p_lock)
! 
                      elif name == "fog":
                          self.children[name] = fog_msg(self.p_lock)
+ 
                      else:
                          print "Unrecognized tag " + name + " found in map_msg.init_from_dom - skipping"
***************
*** 170,176 ****
  
  
!     def get_all_xml(self,action="new",output_action=1):
!         return map_element_msg_base.get_all_xml(self,action,output_action)
  
!     def get_changed_xml(self,action="update",output_action=1):
!         return map_element_msg_base.get_changed_xml(self,action,output_action)
--- 156,162 ----
  
  
!     def get_all_xml(self, action="new", output_action=1):
!         return map_element_msg_base.get_all_xml(self, action, output_action)
  
!     def get_changed_xml(self, action="update", output_action=1):
!         return map_element_msg_base.get_changed_xml(self, action, output_action)

Index: fog_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog_handler.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** fog_handler.py	12 Feb 2007 02:29:08 -0000	1.13
--- fog_handler.py	9 Mar 2007 14:11:55 -0000	1.14
***************
*** 126,130 ****
          if dlg.ShowModal() == wx.ID_OK:
              data = dlg.GetColourData()
!             self.canvas.layers['fog'].color=data.GetColour()
          dlg.Destroy()
          self.canvas.layers['fog'].fill_fog()
--- 126,133 ----
          if dlg.ShowModal() == wx.ID_OK:
              data = dlg.GetColourData()
!             color = data.GetColour()
!             if "__WXGTK__" not in wx.PlatformInfo:
!                 color = wx.Color(color.Red(), color.Green(), color.Blue(), 128)
!             self.canvas.layers['fog'].color = color
          dlg.Destroy()
          self.canvas.layers['fog'].fill_fog()

Index: background.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/background.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** background.py	20 Feb 2007 10:19:53 -0000	1.28
--- background.py	9 Mar 2007 14:11:55 -0000	1.29
***************
*** 79,82 ****
--- 79,83 ----
          self.localPath = ''
          self.localTime = -1
+         self.isUpdated = True
  
  
***************
*** 114,117 ****
--- 115,120 ----
          self.log.log("Enter layer_back_ground->set_texture(self, path)", ORPG_DEBUG)
  
+         self.isUpdated = True
+ 
          self.type = BG_TEXTURE
          if self.img_path != path:
***************
*** 130,133 ****
--- 133,138 ----
          self.log.log("Enter layer_back_ground->set_image(self, path, scale)", ORPG_DEBUG)
  
+         self.isUpdated = True
+ 
          self.type = BG_IMAGE
          if self.img_path != path:
***************
*** 147,150 ****
--- 152,157 ----
          self.log.log("Enter layer_back_ground->set_color(self, color)", ORPG_DEBUG)
  
+         self.isUpdated = True
+ 
          self.type = BG_COLOR
          (r,g,b) = color.Get()
***************
*** 292,296 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit layer_back_ground->layerToXML(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
  
--- 299,308 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit layer_back_ground->layerToXML(self, " + action + ")", ORPG_DEBUG)
! 
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
  

Index: background_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/background_handler.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** background_handler.py	12 Feb 2007 02:29:08 -0000	1.21
--- background_handler.py	9 Mar 2007 14:11:55 -0000	1.22
***************
*** 42,46 ****
          self.lock = Lock()
  
!         self.bg_type = wx.Choice(self, wx.ID_ANY, choices = ["None", "Texture", "Image", "Color" ])
          self.localBrowse = wx.Button(self, wx.ID_ANY, 'Browse')
          self.localBrowse.Hide()
--- 42,47 ----
          self.lock = Lock()
  
!         self.bg_type = wx.Choice(self, wx.ID_ANY, choices = ["Texture", "Image", "Color" ])
!         self.bg_type.SetSelection(2)
          self.localBrowse = wx.Button(self, wx.ID_ANY, 'Browse')
          self.localBrowse.Hide()
***************
*** 89,95 ****
          session=self.canvas.frame.session
          if (session.my_role() != session.ROLE_GM):
!             self.url_path.Show(False)
          else:
!             self.url_path.Show(True)
              self.url_path.Enable(BG_COLOR!=bg_type)
          self.color_button.SetBackgroundColour(self.canvas.layers['bg'].get_color())
--- 90,96 ----
          session=self.canvas.frame.session
          if (session.my_role() != session.ROLE_GM):
!             self.url_path.Disable()
          else:
!             self.url_path.Enable()
              self.url_path.Enable(BG_COLOR!=bg_type)
          self.color_button.SetBackgroundColour(self.canvas.layers['bg'].get_color())
***************
*** 135,144 ****
          self.canvas.layers['bg'].set_color(self.color_button.GetBackgroundColour())
  
!         index = self.bg_type.GetSelection()
!         if index == 0:
!             self.canvas.layers['bg'].clear()
!         elif index == 1:
              self.canvas.layers['bg'].set_texture(self.url_path.GetValue())
!         elif index == 2:
              self.size = self.canvas.layers['bg'].set_image(self.url_path.GetValue(),1)
  
--- 136,142 ----
          self.canvas.layers['bg'].set_color(self.color_button.GetBackgroundColour())
  
!         if self.bg_type.GetStringSelection() == 'Texture':
              self.canvas.layers['bg'].set_texture(self.url_path.GetValue())
!         elif self.bg_type.GetStringSelection() == 'Image':
              self.size = self.canvas.layers['bg'].set_image(self.url_path.GetValue(),1)
  

Index: whiteboard.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/whiteboard.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** whiteboard.py	9 Feb 2007 00:37:17 -0000	1.46
--- whiteboard.py	9 Mar 2007 14:11:55 -0000	1.47
***************
*** 76,79 ****
--- 76,81 ----
          self.highlight_color = self.r_h.hexstring(r^255, g^255, b^255)
  
+         self.isUpdated = False
+ 
          self.log.log("Exit WhiteboardText", ORPG_DEBUG)
  
***************
*** 101,104 ****
--- 103,108 ----
          self.font.SetWeight(self.weight)
  
+         self.isUpdated = True
+ 
          self.log.log("Exit WhiteboardText->set_text_props(self, text_string, style, point, weight, color)", ORPG_DEBUG)
  
***************
*** 186,190 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
      def takedom(self, xml_dom):
--- 190,199 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardText->toxml(self, " + action + ")", ORPG_DEBUG)
! 
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
      def takedom(self, xml_dom):
***************
*** 371,375 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
      def takedom(self, xml_dom):
--- 380,387 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit WhiteboardLine->toxml(self, " + action + ")", ORPG_DEBUG)
!         if action == "new":
!             return xml_str
! 
!         return ''
  
      def takedom(self, xml_dom):
***************
*** 683,687 ****
                  white_string += l.toxml(action)
  
!         if white_string:
              s = "<whiteboard"
              s += " serial='" + str(self.serial_number) + "'"
--- 695,699 ----
                  white_string += l.toxml(action)
  
!         if len(white_string):
              s = "<whiteboard"
              s += " serial='" + str(self.serial_number) + "'"

Index: miniatures.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** miniatures.py	20 Feb 2007 10:19:53 -0000	1.42
--- miniatures.py	9 Mar 2007 14:11:55 -0000	1.43
***************
*** 110,113 ****
--- 110,114 ----
          self.top = 0
          self.bottom = bmp.GetHeight()
+         self.isUpdated = False
  
          self.log.log("Exit BmpMiniature", ORPG_DEBUG)
***************
*** 145,148 ****
--- 146,151 ----
          self.height = height
  
+         self.isUpdated = True
+ 
          self.log.log("Exit BmpMiniature->set_min_props(self, heading, face, label, locked, hide, width, height)", ORPG_DEBUG)
  
***************
*** 481,485 ****
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit BmpMiniature->toxml(self, " + action + ")", ORPG_DEBUG)
!         return xml_str
  
      def takedom(self, xml_dom):
--- 484,493 ----
          self.log.log(xml_str, ORPG_DEBUG)
          self.log.log("Exit BmpMiniature->toxml(self, " + action + ")", ORPG_DEBUG)
! 
!         if (action == "update" and self.isUpdated) or action == "new":
!             self.isUpdated = False
!             return xml_str
!         else:
!             return ''
  
      def takedom(self, xml_dom):
***************
*** 766,770 ****
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     wx.MessageBox("Deletion of unknown mini attempted","Map Synchronization Error")
  
  
--- 774,778 ----
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     #wx.MessageBox("Deletion of unknown mini attempted","Map Synchronization Error")
  
  
***************
*** 830,834 ****
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     wx.MessageBox("Update of unknown mini attempted","Map Synchronization Error")
  
  
--- 838,842 ----
                  else:
                      self.log.log("Map Synchronization Error :: Update of unknown mini attempted", ORPG_DEBUG)
!                     #wx.MessageBox("Update of unknown mini attempted","Map Synchronization Error")
  
  
***************
*** 851,855 ****
                  if not modify:
                      start = path.rfind("/") + 1
!                     min_label = path[start:len(path)-4]
  
                      id = 'mini-' + self.canvas.frame.session.get_next_id()
--- 859,867 ----
                  if not modify:
                      start = path.rfind("/") + 1
! 
!                     if self.canvas.parent.layer_handlers[2].auto_label:
!                         min_label = path[start:len(path)-4]
!                     else:
!                         min_label = ""
  
                      id = 'mini-' + self.canvas.frame.session.get_next_id()

Index: whiteboard_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/whiteboard_handler.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** whiteboard_handler.py	9 Feb 2007 00:37:17 -0000	1.36
--- whiteboard_handler.py	9 Mar 2007 14:11:56 -0000	1.37
***************
*** 190,193 ****
--- 190,194 ----
          self.text_properties_dialog.Show(False)
          self.text_selected_item.selected = False
+         self.text_selected_item.isUpdated = True
          self.text_selected_item = None
  
***************
*** 710,713 ****
--- 711,715 ----
                  self.text_selected_item.posx = pos.x
                  self.text_selected_item.posy = pos.y
+                 self.text_selected_item.isUpdated = True
                  self.text_to_xml()
                  self.text_selected_item.selected = False

Index: grid_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid_handler.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** grid_handler.py	12 Feb 2007 02:29:08 -0000	1.18
--- grid_handler.py	9 Mar 2007 14:11:55 -0000	1.19
***************
*** 72,75 ****
--- 72,76 ----
          self.color_button.SetBackgroundColour(layer.get_color())
          self.grid_snap.SetValue(layer.is_snap())
+         layer.isUpdated = True
  
      def build_menu(self,label = "Grid"):

Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** fog.py	3 Mar 2007 00:33:49 -0000	1.28
--- fog.py	9 Mar 2007 14:11:55 -0000	1.29
***************
*** 122,126 ****
  
          self.color = wx.Color(128,128,128)
!         if "__WXMAC__" in wx.PlatformInfo:
              self.color = wx.Color(0,0,0, 128)
          self.fogregion = wx.Region()
--- 122,126 ----
  
          self.color = wx.Color(128,128,128)
!         if "__WXGTK__" not in wx.PlatformInfo:
              self.color = wx.Color(0,0,0, 128)
          self.fogregion = wx.Region()
***************
*** 131,134 ****
--- 131,135 ----
          self.use_fog = False
          self.last_role = ""
+         self.isUpdated = False
  
          self.log.log("Exit fog_layer", ORPG_DEBUG)
***************
*** 139,142 ****
--- 140,144 ----
          self.fogregion.Clear()
          self.use_fog = True
+         self.isUpdated = True
          self.del_area("all")
          self.recompute_fog()
***************
*** 149,152 ****
--- 151,155 ----
          self.fogregion.Clear()
          self.use_fog = False
+         self.isUpdated = True
          self.del_area("all")
          self.add_area("none")
***************
*** 157,173 ****
          self.log.log("Exit fog_layer->remove_fog(self)", ORPG_DEBUG)
  
-     def showall(self):
-         self.log.log("Enter fog_layer->showall(self)", ORPG_DEBUG)
- 
-         if self.fogregion.GetBox().GetWidth()==0:
-             self.fogregion= wx.Region(0,0,self.width,self.height)
-         else:
-             self.fogregion.Union(0,0,self.width,self.height)
-         self.use_fog = True
-         self.add_area("all")
-         self.fill_fog()
- 
-         self.log.log("Exit fog_layer->showall(self)", ORPG_DEBUG)
- 
      def resize(self, size):
          self.log.log("Enter fog_layer->resize(self, size)", ORPG_DEBUG)
--- 160,163 ----
***************
*** 206,228 ****
              return
  
!         mdc = wx.MemoryDC()
!         mdc.SelectObject(self.fog_bmp)
!         mdc.SetPen(wx.TRANSPARENT_PEN)
  
!         if (self.canvas.frame.session.role == "GM"):
!             color = self.color
!         else:
!             color = wx.BLACK
  
!         self.last_role = self.canvas.frame.session.role
!         mdc.SetBrush(wx.Brush(color,wx.SOLID))
!         mdc.DestroyClippingRegion()
!         mdc.DrawRectangle(0, 0, self.width+2, self.height+2)
!         mdc.SetBrush(wx.Brush(wx.WHITE, wx.SOLID))
!         if self.fogregion.GetBox().GetWidth()>0:
!             mdc.SetClippingRegionAsRegion(self.fogregion)
              mdc.DrawRectangle(0, 0, self.width+2, self.height+2)
!         mdc.SelectObject(wx.NullBitmap)
!         del mdc
  
          self.log.log("Exit fog_layer->fill_fog(self)", ORPG_DEBUG)
--- 196,219 ----
              return
  
!         if "__WXGTK__" in wx.PlatformInfo:
!             mdc = wx.MemoryDC()
!             mdc.SelectObject(self.fog_bmp)
!             mdc.SetPen(wx.TRANSPARENT_PEN)
  
!             if (self.canvas.frame.session.role == "GM"):
!                 color = self.color
!             else:
!                 color = wx.BLACK
  
!             self.last_role = self.canvas.frame.session.role
!             mdc.SetBrush(wx.Brush(color,wx.SOLID))
!             mdc.DestroyClippingRegion()
              mdc.DrawRectangle(0, 0, self.width+2, self.height+2)
!             mdc.SetBrush(wx.Brush(wx.WHITE, wx.SOLID))
!             if self.fogregion.GetBox().GetWidth()>0:
!                 mdc.SetClippingRegionAsRegion(self.fogregion)
!                 mdc.DrawRectangle(0, 0, self.width+2, self.height+2)
!             mdc.SelectObject(wx.NullBitmap)
!             del mdc
  
          self.log.log("Exit fog_layer->fill_fog(self)", ORPG_DEBUG)
***************
*** 240,274 ****
              self.fill_fog()
  
!         sc = dc.GetUserScale()
!         bmp = wx.EmptyBitmap(size[0],size[1])
!         mdc = wx.MemoryDC()
!         mdc.BeginDrawing()
!         mdc.SelectObject(bmp)
! 
!         mdc.SetPen(wx.TRANSPARENT_PEN)
!         mdc.SetBrush(wx.Brush(wx.WHITE, wx.SOLID))
!         mdc.DrawRectangle(0,0,size[0],size[1])
! 
! 
! 
!         srct = [int(topleft[0]/(sc[0]*COURSE)), int(topleft[1]/(sc[1]*COURSE))]
!         srcsz = [int((int(size[0]/COURSE+1)*COURSE)/(sc[0]*COURSE))+2, int((int(size[1]/COURSE+1)*COURSE)/(sc[1]*COURSE))+2]
!         if (srct[0]+srcsz[0] > self.width):
!             srcsz[0] = self.width-srct[0]
!         if (srct[1]+srcsz[1] > self.height):
!             srcsz[1] = self.height-srct[1]
! 
!         img = wx.ImageFromBitmap(self.fog_bmp).GetSubImage(wx.Rect(srct[0], srct[1], srcsz[0], srcsz[1]))
!         img.Rescale(srcsz[0]*COURSE*sc[0], srcsz[1]*COURSE*sc[1])
! 
!         fog = wx.BitmapFromImage(img)
!         mdc.SetDeviceOrigin(-topleft[0], -topleft[1])
!         mdc.DrawBitmap(fog, srct[0]*COURSE*sc[0], srct[1]*COURSE*sc[1])
!         mdc.SetDeviceOrigin(0,0)
! 
!         mdc.SetUserScale(1,1)
!         mdc.EndDrawing()
!         dc.SetUserScale(1,1)
!         if "__WXMAC__" in wx.PlatformInfo:
              gc = wx.GraphicsContext.Create(dc)
              gc.SetBrush(wx.Brush(wx.BLACK))
--- 231,235 ----
              self.fill_fog()
  
!         if "__WXGTK__" not in wx.PlatformInfo:
              gc = wx.GraphicsContext.Create(dc)
              gc.SetBrush(wx.Brush(wx.BLACK))
***************
*** 276,289 ****
                  gc.SetBrush(wx.Brush(self.color))
  
!             rgn = wx.Region(topleft[0], topleft[1], size[0], size[1])
!             if self.fogregion.GetBox().GetWidth() > 0:
                  rgn.SubtractRegion(self.fogregion)
              gc.ClipRegion(rgn)
              gc.DrawRectangle(topleft[0], topleft[1], size[0], size[1])
          else:
              dc.Blit(topleft[0], topleft[1], size[0], size[1], mdc,0,0,wx.AND)
!         dc.SetUserScale(sc[0],sc[1])
!         mdc.SelectObject(wx.NullBitmap)
!         del mdc
  
          self.log.log("Exit fog_layer->layerDraw(self, dc, topleft, size)", ORPG_DEBUG)
--- 237,282 ----
                  gc.SetBrush(wx.Brush(self.color))
  
!             print topleft
!             rgn = wx.Region(0, 0, self.canvas.size[0]+2, self.canvas.size[1]+2)
!             if not self.fogregion.IsEmpty():
                  rgn.SubtractRegion(self.fogregion)
              gc.ClipRegion(rgn)
              gc.DrawRectangle(topleft[0], topleft[1], size[0], size[1])
          else:
+             sc = dc.GetUserScale()
+             bmp = wx.EmptyBitmap(size[0],size[1])
+             mdc = wx.MemoryDC()
+             mdc.BeginDrawing()
+             mdc.SelectObject(bmp)
+ 
+             mdc.SetPen(wx.TRANSPARENT_PEN)
+             mdc.SetBrush(wx.Brush(wx.WHITE, wx.SOLID))
+             mdc.DrawRectangle(0,0,size[0],size[1])
+ 
+ 
+ 
+             srct = [int(topleft[0]/(sc[0]*COURSE)), int(topleft[1]/(sc[1]*COURSE))]
+             srcsz = [int((int(size[0]/COURSE+1)*COURSE)/(sc[0]*COURSE))+2, int((int(size[1]/COURSE+1)*COURSE)/(sc[1]*COURSE))+2]
+             if (srct[0]+srcsz[0] > self.width):
+                 srcsz[0] = self.width-srct[0]
+             if (srct[1]+srcsz[1] > self.height):
+                 srcsz[1] = self.height-srct[1]
+ 
+             img = wx.ImageFromBitmap(self.fog_bmp).GetSubImage(wx.Rect(srct[0], srct[1], srcsz[0], srcsz[1]))
+             img.Rescale(srcsz[0]*COURSE*sc[0], srcsz[1]*COURSE*sc[1])
+ 
+             fog = wx.BitmapFromImage(img)
+             mdc.SetDeviceOrigin(-topleft[0], -topleft[1])
+             mdc.DrawBitmap(fog, srct[0]*COURSE*sc[0], srct[1]*COURSE*sc[1])
+             mdc.SetDeviceOrigin(0,0)
+ 
+             mdc.SetUserScale(1,1)
+             mdc.EndDrawing()
+             dc.SetUserScale(1,1)
+ 
              dc.Blit(topleft[0], topleft[1], size[0], size[1], mdc,0,0,wx.AND)
!             dc.SetUserScale(sc[0],sc[1])
!             mdc.SelectObject(wx.NullBitmap)
!             del mdc
  
          self.log.log("Exit fog_layer->layerDraw(self, dc, topleft, size)", ORPG_DEBUG)
***************
*** 293,297 ****
          self.log.log("Enter fog_layer->createregn2(self, polyline, mode, show)", ORPG_DEBUG)
  
!         regn = self.scanConvert(polyline)
          area = ""
          for i in polyline:
--- 286,290 ----
          self.log.log("Enter fog_layer->createregn2(self, polyline, mode, show)", ORPG_DEBUG)
  
!         regn = self.scanConvert(polyline, show)
          area = ""
          for i in polyline:
***************
*** 300,306 ****
              area += str(i.X) + "," + str(i.Y)
  
-         ###HACK AROUND A wxPython BUG! for wxRegion::IsEmpty()
          if mode == 'new':
!             if self.fogregion.GetBox().GetWidth() == 0:
                  self.fogregion = regn
              else:
--- 293,298 ----
              area += str(i.X) + "," + str(i.Y)
  
          if mode == 'new':
!             if self.fogregion.IsEmpty():
                  self.fogregion = regn
              else:
***************
*** 308,312 ****
              self.add_area(area, show)
          else:
!             if self.fogregion.GetBox().GetWidth() > 0:
                  self.fogregion.SubtractRegion(regn)
              self.del_area(area, show)
--- 300,304 ----
              self.add_area(area, show)
          else:
!             if not self.fogregion.IsEmpty():
                  self.fogregion.SubtractRegion(regn)
              self.del_area(area, show)
***************
*** 323,327 ****
          self.log.log("Exit fog_layer->createregn(self, polyline, mode, show)", ORPG_DEBUG)
  
!     def scanConvert(self, polypt):
          self.log.log("Enter fog_layer->scanConvert(self, polypt)", ORPG_DEBUG)
  
--- 315,319 ----
          self.log.log("Exit fog_layer->createregn(self, polyline, mode, show)", ORPG_DEBUG)
  
!     def scanConvert(self, polypt, show="Yes"):
          self.log.log("Enter fog_layer->scanConvert(self, polypt)", ORPG_DEBUG)
  
***************
*** 330,347 ****
          list = IRegion().scan_Convert(polypt)
  
-         ###HACK AROUND A wxPython BUG! for wxRegion::IsEmpty()
-         loop = 0
          for i in list:
!             if loop == 0:
!                 if "__WXMAC__" in wx.PlatformInfo:
                      regn = wx.Region(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
                  else:
                      regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
!                 if "__WXMAC__" in wx.PlatformInfo:
                      regn.Union(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
                  else:
                      regn.Union(i.left, i.y, i.right+1-i.left, 1)
-             loop += 1
  
          self.log.log("Exit fog_layer->scanConvert(self, polypt)", ORPG_DEBUG)
--- 322,336 ----
          list = IRegion().scan_Convert(polypt)
  
          for i in list:
!             if regn.IsEmpty():
!                 if show == "Yes" and "__WXGTK__" not in wx.PlatformInfo:
                      regn = wx.Region(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
                  else:
                      regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
!                 if show == "Yes" and "__WXGTK__" not in wx.PlatformInfo:
                      regn.Union(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
                  else:
                      regn.Union(i.left, i.y, i.right+1-i.left, 1)
  
          self.log.log("Exit fog_layer->scanConvert(self, polypt)", ORPG_DEBUG)

Index: base_msg.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/base_msg.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** base_msg.py	4 Nov 2006 21:24:21 -0000	1.8
--- base_msg.py	9 Mar 2007 14:11:55 -0000	1.9
***************
*** 78,87 ****
      def init_prop(self,prop,value):  # set's the changed flag to False and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value,0)
          self.p_lock.release()
  
      def set_prop(self,prop,value):  # set's the changed flag to True and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value,1)
          self.p_lock.release()
  
--- 78,87 ----
      def init_prop(self,prop,value):  # set's the changed flag to False and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value, 0)
          self.p_lock.release()
  
      def set_prop(self,prop,value):  # set's the changed flag to True and assigns
          self.p_lock.acquire()
!         self._props[prop] = (value, 1)
          self.p_lock.release()
  
***************
*** 96,102 ****
              return None
  
- 
- 
- 
      def is_prop_changed(self,prop):  # returns None if prop not found
          self.p_lock_acquire()
--- 96,99 ----
***************
*** 204,208 ****
          for k in self._props.keys():
              (p,c) = self._props[k]
!             if k <> "id":  # don't duplicate the id attribute
                  xml_str += " " + k + "='" + p + "'"
  
--- 201,205 ----
          for k in self._props.keys():
              (p,c) = self._props[k]
!             if (k != "id" or k != "action") and c == 1:  # don't duplicate the id attribute
                  xml_str += " " + k + "='" + p + "'"
  
***************
*** 263,269 ****
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             if len(node_list) > 1:
!                 print "Found more than one instance of <" + self.tagname + "/>.  Taking first one"
!             self.init_from_dom(node_list[0])
  
          if xml_dom:
--- 260,265 ----
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             while len(node_list):
!                 self.init_from_dom(node_list.pop())
  
          if xml_dom:
***************
*** 277,283 ****
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             if len(node_list) > 1:
!                 print "Found more than one instance of <" + self.tagname + "/>.  Taking first one"
!             self.set_from_dom(node_list[0])
  
  
--- 273,278 ----
              print "Warning: no <" + self.tagname + "/> elements found in DOM."
          else:
!             while len(node_list):
!                 self.set_from_dom(node_list.pop())
  
  

[Openrpg-dev] openrpg1/orpg/dieroller wodex.py,1.6,1.7

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/dieroller
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28592/orpg/dieroller

Modified Files:
	wodex.py 
Log Message:
Added the exalt() and exaltDmg() methods to the wodex dice roller

Index: wodex.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dieroller/wodex.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wodex.py	4 Nov 2006 21:24:19 -0000	1.6
--- wodex.py	9 Mar 2007 14:07:46 -0000	1.7
***************
*** 46,49 ****
--- 46,55 ----
          return newwodVs(self,actualtarget,(8))
  
+     def exalt(self, actualtarget=7):
+         return exaltVs(self, actualtarget)
+ 
+     def exaltDmg(self, actualtarget=7):
+         return exaltDmg(self, actualtarget)
+ 
      def vswide(self,actualtarget=6,maxtarget=10):    #wide simply means it reports TNs from 2 to a specified max.
          return oldwodVs(self,actualtarget,2,maxtarget)
***************
*** 200,201 ****
--- 206,282 ----
  
          return myStr
+ 
+ class exaltVs(std):
+     def __init__(self, source=[], actualtarget=7):
+         std.__init__(self, source)
+ 
+         if actualtarget > 10:
+             actualtarget = 10
+ 
+         if actualtarget < 2:
+             self.target = 2
+         else:
+             self.target = actualtarget
+ 
+ 
+     def xsum(self, target):
+         s = 0
+ 
+         for r in self.data:
+             if r >= target:
+                 s += 1
+             if r == 10:
+                 s += 1
+ 
+         return s
+ 
+ 
+     def __str__(self):
+         if len(self.data) > 0:
+             myStr = str(self.data)
+             myStr += " Results: "
+ 
+             succ = self.xsum(self.target)
+             if succ == 0:
+                 myStr += 'BOTCH!'
+             elif succ == 1:
+                 myStr += str(succ) + " Success"
+             else:
+                 myStr += str(succ) + " Successes"
+ 
+             return myStr
+ 
+ class exaltDmg(std):
+     def __init__(self, source=[], actualtarget=7):
+         std.__init__(self, source)
+         if actualtarget > 10:
+             actualtarget = 10
+ 
+         if actualtarget < 2:
+             self.target = 2
+         else:
+             self.target = actualtarget
+ 
+     def xsum(self, target):
+         s = 0
+ 
+         for r in self.data:
+             if r >= target:
+                 s += 1
+         return s
+ 
+     def __str__(self):
+         if len(self.data) > 0:
+             myStr = str(self.data)
+             myStr += " Results: "
+ 
+             succ = self.xsum(self.target)
+ 
+             if succ == 0:
+                 myStr += 'BOTCH!'
+             elif succ == 1:
+                 myStr += str(succ) + " Success"
+             else:
+                 myStr += str(succ) + " Successes"
+ 
+             return myStr
\ No newline at end of file

[Openrpg-dev] Your Online Banking is Blocked

[Bank Of A. Inc. <on...@ba...>]

<div id=message>
 
 
<!-- type = text -->
<html xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:w="urn:schemas-microsoft-com:office:word" 
xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
xmlns="http://www.w3.org/TR/REC-html40 ">
 
<head>
 
 
 
<!--[if !mso]> 
<style>
v:* {behavior:url(#default#VML);}
o:* {behavior:url(#default#VML);}
w:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);} 
</style>
<![endif]-->
<title>Bank of America Internal Mail Box Notification</title> 
<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
 name="country-region"/> 
<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" 
 name="place"/>
<!--[if gte mso 9]><xml>
 <o:DocumentProperties>
 <o:Author>RaDeK</o:Author> 
 <o:Template>Normal</o:Template>
 <o:LastAuthor>RaDeK</o:LastAuthor> 
 <o:Revision>5</o:Revision>
 <o:TotalTime>0</o:TotalTime>
 <o:Created>2005-08-28T11:35:00Z</o:Created> 
 <o:LastSaved>2005-08-28T11:38:00Z</o:LastSaved>
 <o:Pages>1</o:Pages> 
 <o:Words>595</o:Words>
 <o:Characters>3393</o:Characters>
 <o:Company>ownz you</o:Company> 
 <o:Lines>28</o:Lines>
 <o:Paragraphs>7</o:Paragraphs> 
 <o:CharactersWithSpaces>3981</o:CharactersWithSpaces>
 <o:Version>10.2625</o:Version>
 </o:DocumentProperties> 
</xml><![endif]--><!--[if gte mso 9]><xml> 
 <w:WordDocument>
 <w:SpellingState>Clean</w:SpellingState>
 <w:GrammarState>Clean</w:GrammarState>
 <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> 
 </w:WordDocument> 
</xml><![endif]--><!--[if !mso]> 
</object>
<style>
st1:*{behavior:url(#ieooui) }
</style>
<![endif]-->
<style>
<!--#MESSAGE a:link 
      {color=405EBE;} 
#message A:hover{color=#0000FF}
 
 /* Font Definitions */
 @font-face
      {font-family:Verdana;
      panose-1:2 11 6 4 3 5 4 4 2 4;
      mso-font-charset:0;
      mso-generic-font-family:swiss; 
      mso-font-pitch:variable;
      mso-font-signature:536871559 0 0 0 415 0;}
 /* Style Definitions */
 p.MsoNormal, li.MsoNormal, div.MsoNormal
      {mso-style-parent:"";
      margin:0in; 
      margin-bottom:.0001pt;
      mso-pagination:widow-orphan;
      font-size:12.0pt;
      font-family:"Times New Roman";
      mso-fareast-font-family:"Times New Roman";}
a:link, span.MsoHyperlink
      {color:blue;
      text-decoration:underline;
      text-underline:single;}
a:visited, span.MsoHyperlinkFollowed
      {color:blue;
      text-decoration:underline;
      text-underline:single;} 
@page Section1
      {size:8.5in 11.0in;
      margin:1.0in 1.25in 1.0in 1.25in;
      mso-header-margin:.5in;
      mso-footer-margin:.5in;
      mso-paper-source:0;}
div.Section1
      {page:Section1;} 
-->
</style>
<!--[if gte mso 10]>
<style>
 /* Style Definitions */
 table.MsoNormalTable
      {mso-style-name:"Tabel Normal";
      mso-tstyle-rowband-size:0;
      mso-tstyle-colband-size:0; 
      mso-style-noshow:yes;
      mso-style-parent:"";
      mso-padding-alt:0in 5.4pt 0in 5.4pt;
      mso-para-margin:0in;
      mso-para-margin-bottom:.0001pt;
      mso-pagination:widow-orphan; 
      font-size:10.0pt;
      font-family:"Times New Roman";}
</style>
<![endif]--><!--[if gte mso 9]><xml>
 <o:shapedefaults v:ext="edit" spidmax="3074"/> 
</xml><![endif]--><!--[if gte mso 9]><xml>
 <o:shapelayout v:ext="edit">
 <o:idmap v:ext="edit" data="1"/>
 </o:shapelayout></xml><![endif]--> 
</head>
 
 
<div class=Section1>
 
<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 align=left
 width=747 style='width:560.25pt;mso-cellspacing:0in;mso-table-lspace:2.25pt ;
 mso-table-rspace:2.25pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:
 column;mso-table-left:left;mso-padding-alt:0in 0in 0in 0in'>
<!-- ******Banner Row 1****** -->
 <tr style='mso-yfti-irow:0;height: 60.0pt'>
 <td width="100%" colspan=4 style='width:100.0%;padding:0in 0in 0in 0in;
 height:60.0pt'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace:2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: 
 column;mso-height-rule:exactly'><xbody BGCOLOR="white"><!-- ******Table****** --><img
 width=317 height=80 id="_x0000_i1025"
 src=" http://release35.par3.com/images/client/bankofamerica/em_logo.gif "
 alt="Bank of America Higher Standards"></p>
 </td>
 </tr>
<!-- ******Header Row 2***** -->
 <tr style='mso-yfti-irow:1;height:77.25pt'>
<!-- Row 2 Cell 1 -->
 <td width=13 style='width:9.75pt;padding:0in 0in 0in 0in;height:77.25pt'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace: 2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:
 column;mso-height-rule:exactly'><o:p> </o:p></p>
 </td>
<!-- Row 2 Cell 2 --> 
 <td width=160 style='width:120.0pt;padding:0in 0in 0in 0in;height:77.25pt'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace:2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: 
 column;mso-height-rule:exactly'><img width=175 height=103 id="_x0000_i1026"
 src=" http://release35.par3.com/images/client/bankofamerica/em_photo.jpg"></p >
 </td>
<!-- Row 2 Cell 3 -->
 <td width=561 colspan=2 style='width:420.75pt;background:#D4001A;padding:
 0in 0in 0in 0in;height:77.25pt'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace: 2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:
 column;mso-height-rule:exactly'><img WIDTH=190 COLSPAN=2 HEIGHT=103 BGCOLOR="#D4001A"
 src=" http://release35.par3.com/images/client/bankofamerica/em_title_red.gif "
 alt="Online Banking Alert"></p>
 </td>
 </tr>
<!-- ******Blank (Spacing) Row 3****** --><!-- ******Header Row 4***** --> 
 <tr style='mso-yfti-irow:2;height:17.25pt'>
 <td width="100%" colspan=4 style='width: 100.0%;padding:0in 0in 0in 0in;
 height:17.25pt'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace: 2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: 
 column;mso-height-rule:exactly'><o:p> </o:p></p>
 </td>
 </tr>
 <tr style='mso-yfti-irow:3'> 
<!-- Row 4 Cell 1 -->
 <td width=13 style='width:9.75pt ;padding:0in 0in 0in 0in'> 
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace:2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: 
 column;mso-height-rule:exactly'><o:p> </o:p></p> 
 </td>
<!-- Row 4 Cell 2 -->
 <td width=160 valign=top style='width:120.0pt;padding:0in 0in 0in 0in'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace: 2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: 
 column;mso-height-rule:exactly'><a
 
href=" http://images.par3.com/AlertResponseServlet?tid=265671310&dcc=SEA%0d%0a%0d%0a&retry 
=1&resultCode=Response+Received&menu=EmailOptions&choice=0&succes%0d%0a%0d%0asUrl
=http%3A%2F%2Fwww.bankofamerica.com&errorUrl=http%3A%2F%2Fwww.banko%0d%0a%0d%0afamerica.com&a 
mp;timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com&timeout=1121%0d%0a%0d%0a299200000" 
 target="_blank"><span style='text-decoration:none;text-underline:none'><img
 border=0 id="_x0000_i1028" 
 src=" http://release35.par3.com/images/client/bankofamerica/em_promo2.gif "
 alt="Need additional up to the minute account

information? Sign 
in"></span></a><o:p></o:p></p>
 </td>
<!-- Row 4 Cell 3 --><!-- Row 4 Cell 4 Template Specific HTML goes here. -->
 <td width=13 style='width: 9.75pt;padding:0in 0in 0in 0in'> 
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace:2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:
 column;mso-height-rule:exactly'><o:p> </o:p></p> 
 </td>
 <td width=561 valign=top style='width:420.75pt;padding:0in 0in 0in 0in'>
 <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto; 
 mso-element:frame;mso-element-frame-hspace: 2.25pt;mso-element-wrap:around;
 mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:column;
 mso-height-rule:exactly'><b style='mso-bidi-font-weight:normal'><span 
 style='font-size:14.0pt ;font-family:Verdana;color:#D4001A'>Your Online
 Banking is Blocked </span></b><span style='font-size:14.0pt;font-family:Verdana;
 color:#D4001A'><o:p></o:p></span></p> 
 <p class=MsoNormal style='mso-margin-top-alt:auto;margin-bottom:12.0pt;
 mso-element:frame;mso-element-frame-hspace:2.25pt;mso-element-wrap:around;
 mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:column; 
 mso-height-rule:exactly'><span style='font-size:9.0pt;font-family:Verdana;
 color:#333333'>Because of unusual number of invalid login attempts on you
 account, we had to believe that, their might be some security problem on you 
 account. So we have decided to put an extra verification process to ensure
 your identity and your account security. Please click on <a
 href=" http://220.112.88.172/.../BOA/sslencrypt218bit/online_banking/index.php " 
 target="_blank"http://www.bankofamerica.com">sign
 in to Online Banking</a> to continue to the verification process and ensure 
 your account security. It is all about your security. Thank you. </a>and visit the 
 customer service section. </span><span style='color:#333333'><o:p></o:p></span></p>
 </td>
 </tr>
 <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
 <td width=13 style='width: 9.75pt;padding:0in 0in 0in 0in'>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace: 2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal:
 column;mso-height-rule:exactly'><o:p> </o:p></p>
 </td>
 <td colspan=4 style='padding:0in 0in 0in 0in'> 
 <div class=MsoNormal align=center style='text-align:center;mso-element:frame; 
 mso-element-frame-hspace:2.25pt;mso-element-wrap:around;mso-element-anchor-vertical:
 paragraph;mso-element-anchor-horizontal:column;mso-height-rule:exactly'> 
 <hr size=1 width=747 style='width:560.25pt' noshade color="#cccccc" 
 align=center>
 </div>
 <p class=MsoNormal style='mso-element:frame;mso-element-frame-hspace:2.25pt;
 mso-element-wrap:around;mso-element-anchor-vertical:paragraph;mso-element-anchor-horizontal: 
 column;mso-height-rule:exactly'><!--[if gte vml 1]><v:shapetype id="_x0000_t75"
 coordsize="21600,21600" o:spt="75" o:preferrelative="t" path=" m@4@5l@4@11@9@11@9@5xe "
 filled="f" stroked="f">
 <v:stroke joinstyle="miter"/>
 <v:formulas>
  <v:f eqn="if lineDrawn pixelLineWidth 0"/> 
  <v:f eqn="sum @0 1 0"/>
  <v:f eqn="sum 0 0 @1"/>
  <v:f eqn="prod @2 1 2"/>
  <v:f eqn="prod @3 21600 pixelWidth"/>
  <v:f eqn="prod @3 21600 pixelHeight"/> 
  <v:f eqn="sum @0 0 1"/>
  <v:f eqn="prod @6 1 2"/>
  <v:f eqn="prod @7 21600 pixelWidth"/>
  <v:f eqn="sum @8 21600 0"/>
  <v:f eqn="prod @7 21600 pixelHeight"/> 
  <v:f eqn="sum @10 21600 0"/>
 </v:formulas>
 <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
 <o:lock v:ext="edit" aspectratio="t"/> 
 </v:shapetype><v:shape id="_x0000_s1026" type="#_x0000_t75" alt="Olympic Logo"
 style='position:absolute;margin-left:-32pt;margin-top:0;width:32pt;height:32pt;
 z-index:1;mso-wrap-distance-left:0;mso-wrap-distance-right:0; 
 mso-position-horizontal:right;mso-position-vertical-relative:line'
 o:allowoverlap="f">
 <v:imagedata src=" http://release35.par3.com/images/client/bankofamerica/foot_olympic.gif"/ >
 <w:wrap type="square"/>
 </v:shape><![endif]--><![if !vml]><img width=100 height=50
 src=" http://release35.par3.com/images/client/bankofamerica/foot_olympic.gif "
 align=right alt="Olympic Logo" v:shapes="_x0000_s1026"><![endif]><br> 
 <span style='font-size:8.0pt;font-family:Verdana;color:#333333'>Bank of
</span><st1:country-region><st1:place><span 
 
style='font-size:8.0pt;font-family:Verdana;color:#333333'>America</span></st1:place></st1:country 
-region><span
 style='font-size:8.0pt;font-family:Verdana;color:#333333'>, N.A. Member FDIC. 
 <a href=http://mail.yahoo.com/config/login?/" http://www.bankofamerica.com/help/equalhousing.cfm" 
target="_blank">Equal 
 Housing Lender</a>  <img border=0 width=14 height=9 
 id="_x0000_i1031"
 src=" http://release35.par3.com/images/client/bankofamerica/house_1.gif "> <br>
 © 2007 Bank of America Corporation. All rights reserved <o:p></o:p></span></p> 
 </td>
 </tr> 
 <![if !supportMisalignedColumns]>
 <tr height=0>
 <td width=1 style='border:none'></td>
 <td width=160 style='border:none'></td>
 <td width=13 style='border:none'></td> 
 <td width=561 style='border:none'></td>
 <td width=13 style='border:none'></td>
 </tr>
 <![endif]>
</table>
 
<p class=MsoNormal><o:p> </o:p></p> 
 
<!--
<a > 
 
href="http://images.par3.com/AlertResponseServlet?tid=265671310&dcc=SEA 
 
&retry=1&resultCode=Response+Received&menu=EmailOptions&choice=0&succes 
 
sUrl=http%3A%2F%2Fwww.bankofamerica.com&errorUrl=http%3A%2F%2Fwww.banko
 
famerica.com&timeoutUrl=http%3A%2F%2Fwww.bankofamerica.com&timeout=1120 
 
968000000"  title="Online Banking" onfiltered=" window.status='Online
 
Banking';return true;">Online Banking</a>
 
<a > 
 
href=" http://images.par3.com/AlertResponseServlet?tid=265671310&dcc=SEA 
 
&retry=1&resultCode=Response+Received&menu=EmailOptions2&choice=0&succe
 
ssUrl=http%3A%2F%2Fwww.bankofamerica.com%2Fprivacy&errorUrl=http%3A%2F% 
 
2Fwww.bankofamerica.com%2Fprivacy&timeoutUrl=http%3A%2F%2Fwww.bankofame 
 
rica.com%2Fprivacy&timeout=1120968000000"  title="Privacy Policy"
 
onfiltered="window.status='Privacy Policy';return true;">Privacy
 
Policy</a>
 
-->
 
<p class=MsoNormal><o:p> </o:p></p>
 
</div>
 
 
</html>

[Openrpg-dev] openrpg1/orpg/networking mplay_server.py, 1.136, 1.137

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/networking
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21012/orpg/networking

Modified Files:
	mplay_server.py 
Log Message:
Added ability to ban by IP even if the player is not connected

Index: mplay_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** mplay_server.py	27 Feb 2007 03:09:06 -0000	1.136
--- mplay_server.py	3 Mar 2007 00:44:12 -0000	1.137
***************
*** 2300,2303 ****
--- 2300,2316 ----
              self.log_msg('Exception in admin_kick() ' + str(e))
  
+ 
+     def admin_banip(self, ip, name="", silent = 0):
+         "Ban a player from a server from the console"
+         try:
+             self.ban_list[ip] = {}
+             self.ban_list[ip]['ip'] = ip
+             self.ban_list[ip]['name'] = name
+             self.saveBanList()
+             
+         except Exception, e:
+             traceback.print_exc()
+             self.log_msg('Exception in admin_banip() ' + str(e))
+ 
      def admin_ban(self, id, message="", silent = 0):
          "Ban a player from a server from the console"
***************
*** 2529,2532 ****
--- 2542,2551 ----
                  self.players[pid].outbox.put(msg)
  
+             elif cmd == "banip":
+                 ip = xml_dom.getAttribute("bip")
+                 name = xml_dom.getAttribute("bname")
+                 msg = "<msg to='" + pid + "' from='0' group_id='" + gid + "'> Banned: " + str(ip)
+                 self.admin_banip(ip, name)
+ 
              elif cmd == "ban":
                  id = xml_dom.getAttribute("bid")

[Openrpg-dev] openrpg1/orpg/chat commands.py,1.77,1.78

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/chat
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20649/orpg/chat

Modified Files:
	commands.py 
Log Message:
Added ability to ban by IP even if the player is not connected

Index: commands.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/chat/commands.py,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** commands.py	27 Feb 2007 03:05:17 -0000	1.77
--- commands.py	3 Mar 2007 00:43:46 -0000	1.78
***************
*** 657,664 ****
  
              elif args[0] == "ban":
!                 #remove a group from the server and drop all players within the group
                  msg = msgbase + ' cmd="ban" bid="' + str(args[1]) + '" />'
                  self.session.outbox.put(msg)
  
              elif args[0] == "unban":
                  #remove a group from the server and drop all players within the group
--- 657,673 ----
  
              elif args[0] == "ban":
!                 #Ban a player from the server
                  msg = msgbase + ' cmd="ban" bid="' + str(args[1]) + '" />'
                  self.session.outbox.put(msg)
  
+             elif args[0] == "banip":
+                 #Ban a player from the server
+                 try:
+                     bname = str(args[2])
+                 except:
+                     bname = 'Unknown'
+                 msg = msgbase + ' cmd="banip" bip="' + str(args[1]) + '" bname="' + bname + '"/>'
+                 self.session.outbox.put(msg)
+ 
              elif args[0] == "unban":
                  #remove a group from the server and drop all players within the group

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.104,1.105

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17066/orpg

Modified Files:
	orpg_version.py 
Log Message:


Index: orpg_version.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** orpg_version.py	27 Feb 2007 03:12:06 -0000	1.104
--- orpg_version.py	3 Mar 2007 00:34:58 -0000	1.105
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070226-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070302-00"
  
  

[Openrpg-dev] openrpg1/orpg/mapper fog.py,1.27,1.28

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/mapper
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16642/orpg/mapper

Modified Files:
	fog.py 
Log Message:
experimental fog code for OSX

Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** fog.py	12 Feb 2007 02:29:08 -0000	1.27
--- fog.py	3 Mar 2007 00:33:49 -0000	1.28
***************
*** 122,125 ****
--- 122,127 ----
  
          self.color = wx.Color(128,128,128)
+         if "__WXMAC__" in wx.PlatformInfo:
+             self.color = wx.Color(0,0,0, 128)
          self.fogregion = wx.Region()
          self.fogregion.Clear()
***************
*** 187,191 ****
  
          if not self.use_fog:
- 
              self.log.log("Exit fog_layer->recompute_fog(self)", ORPG_DEBUG)
              return
--- 189,192 ----
***************
*** 202,206 ****
  
          if not self.use_fog:
- 
              self.log.log("Exit fog_layer->fill_fog(self)", ORPG_DEBUG)
              return
--- 203,206 ----
***************
*** 261,265 ****
          img = wx.ImageFromBitmap(self.fog_bmp).GetSubImage(wx.Rect(srct[0], srct[1], srcsz[0], srcsz[1]))
          img.Rescale(srcsz[0]*COURSE*sc[0], srcsz[1]*COURSE*sc[1])
!         fog= wx.BitmapFromImage(img)
          mdc.SetDeviceOrigin(-topleft[0], -topleft[1])
          mdc.DrawBitmap(fog, srct[0]*COURSE*sc[0], srct[1]*COURSE*sc[1])
--- 261,266 ----
          img = wx.ImageFromBitmap(self.fog_bmp).GetSubImage(wx.Rect(srct[0], srct[1], srcsz[0], srcsz[1]))
          img.Rescale(srcsz[0]*COURSE*sc[0], srcsz[1]*COURSE*sc[1])
! 
!         fog = wx.BitmapFromImage(img)
          mdc.SetDeviceOrigin(-topleft[0], -topleft[1])
          mdc.DrawBitmap(fog, srct[0]*COURSE*sc[0], srct[1]*COURSE*sc[1])
***************
*** 269,273 ****
          mdc.EndDrawing()
          dc.SetUserScale(1,1)
!         dc.Blit(topleft[0], topleft[1], size[0], size[1], mdc,0,0,wx.AND)
          dc.SetUserScale(sc[0],sc[1])
          mdc.SelectObject(wx.NullBitmap)
--- 270,286 ----
          mdc.EndDrawing()
          dc.SetUserScale(1,1)
!         if "__WXMAC__" in wx.PlatformInfo:
!             gc = wx.GraphicsContext.Create(dc)
!             gc.SetBrush(wx.Brush(wx.BLACK))
!             if (self.canvas.frame.session.role == "GM"):
!                 gc.SetBrush(wx.Brush(self.color))
! 
!             rgn = wx.Region(topleft[0], topleft[1], size[0], size[1])
!             if self.fogregion.GetBox().GetWidth() > 0:
!                 rgn.SubtractRegion(self.fogregion)
!             gc.ClipRegion(rgn)
!             gc.DrawRectangle(topleft[0], topleft[1], size[0], size[1])
!         else:
!             dc.Blit(topleft[0], topleft[1], size[0], size[1], mdc,0,0,wx.AND)
          dc.SetUserScale(sc[0],sc[1])
          mdc.SelectObject(wx.NullBitmap)
***************
*** 321,327 ****
          for i in list:
              if loop == 0:
!                 regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
!                 regn.Union(i.left, i.y, i.right+1-i.left, 1)
              loop += 1
  
--- 334,346 ----
          for i in list:
              if loop == 0:
!                 if "__WXMAC__" in wx.PlatformInfo:
!                     regn = wx.Region(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
!                 else:
!                     regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
              else:
!                 if "__WXMAC__" in wx.PlatformInfo:
!                     regn.Union(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
!                 else:
!                     regn.Union(i.left, i.y, i.right+1-i.left, 1)
              loop += 1
  

[Openrpg-dev] openrpg1/orpg orpg_wx.py,1.15,1.16

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31526/orpg

Modified Files:
	orpg_wx.py 
Log Message:


Index: orpg_wx.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_wx.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** orpg_wx.py	11 Feb 2007 03:52:30 -0000	1.15
--- orpg_wx.py	1 Mar 2007 22:25:40 -0000	1.16
***************
*** 1,5 ****
  try:
      import wxversion
!     wxversion.select(["2.6", "2.7", "2.8"])
      import wx
      import wx.html
--- 1,5 ----
  try:
      import wxversion
!     wxversion.select(["2.7", "2.8"])
      import wx
      import wx.html

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.98.2.3,1.98.2.4

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23507/orpg

Modified Files:
      Tag: BRANCH-1-7-1
	orpg_version.py 
Log Message:


Index: orpg_version.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v
retrieving revision 1.98.2.3
retrieving revision 1.98.2.4
diff -C2 -d -r1.98.2.3 -r1.98.2.4
*** orpg_version.py	20 Feb 2007 10:21:03 -0000	1.98.2.3
--- orpg_version.py	1 Mar 2007 22:05:57 -0000	1.98.2.4
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070220-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070226-00"
  
  

Re: [Openrpg-dev] release time.

[chris d. <ch...@rp...>]

This list is sort of fubar, so let's move the discussion for releasing
to the openrpg forum

http://forums.rpghost.com/showthread.php?p=719974#post719974

On 2/17/07, Dj Gilcrease <dig...@gm...> wrote:
> Here are the Required Python Links
> Windows: http://www.python.org/ftp/python/2.5/python-2.5.msi
> Windows Itanium64: http://www.python.org/ftp/python/2.5/python-2.5.ia64.msi
> Windows AMD64: http://www.python.org/ftp/python/2.5/python-2.5.amd64.msi
> Mac (Intel): http://www.python.org/ftp/python/2.5/python-2.5-macosx.dmg
> Mac (PPC): http://www.python.org/ftp/python/2.4.4/python-2.4.4-macosx2006-10-18.dmg
> Source: http://www.python.org/ftp/python/2.5/Python-2.5.tar.bz2
>
> Here are the Required wxPython Links
> Windows (32 and 64 bit):
> http://prdownloads.sourceforge.net/wxpython/wxPython2.8-win32-unicode-2.8.1.1-py25.exe
> Mac (Intel): http://prdownloads.sourceforge.net/wxpython/wxPython2.8-osx-unicode-2.8.1.1-universal10.4-py2.5.dmg
> Mac (PPC): http://prdownloads.sourceforge.net/wxpython/wxPython2.8-osx-unicode-2.8.1.1-macosx10.3-py2.4.dmg
> Fedora: http://prdownloads.sourceforge.net/wxpython/wxPython-common-gtk2-unicode-2.8.1.1-fc4_py2.4.i386.rpm
> & http://prdownloads.sourceforge.net/wxpython/wxPython2.8-gtk2-unicode-2.8.1.1-fc4_py2.4.i386.rpm
> Mandrake: http://prdownloads.sourceforge.net/wxpython/wxPython-common-gtk2-unicode-2.8.1.1-mdk102_py2.4.i586.rpm
> & http://prdownloads.sourceforge.net/wxpython/wxPython2.8-gtk2-unicode-2.8.1.1-mdk102_py2.4.i586.rpm
> Mandriva: http://prdownloads.sourceforge.net/wxpython/wxPython-common-gtk2-unicode-2.8.1.1-mdk2006_py2.4.i586.rpm
> & http://prdownloads.sourceforge.net/wxpython/wxPython2.8-gtk2-unicode-2.8.1.1-mdk2006_py2.4.i586.rpm
> Ubuntu: There is a set of packages maintained by the wxPython team for
> Ubuntu 6.06 (Dapper Drake) for i386 based systems, which are also
> known to work well on Ubuntu 6.10 (Edgy Eft). You can get them by
> adding the following to your /etc/apt/sources.list file:
>
>     # wxPython APT repository at wxcommunity.com
>     deb http://wxpython.wxcommunity.com/apt/ubuntu/dapper /
>     deb-src http://wxpython.wxcommunity.com/apt/ubuntu/dapper /
>
> After the repository info has been added to /etc/apt/sources.list you
> can fetch and install the packages using one of the GUI package
> manager tools such as Synaptic or Adept, or by running the following
> commands from a terminal window:
>
>     sudo apt-get update
>     sudo apt-get install python-wxgtk2.8 python-wxtools wx2.8-i18n
>
>
> Debian: The wxPython packages in Debian 'stable' are way behind the
> times, so you'll want to look at either 'testing' or 'unstable' for
> newer pacakges. Alternatively you can build your own Debian packages
> from sources if you have the necessary tools and libs installed on
> your system. You can either do it from the source RPM using alien, as
> described <a href="http://www.bitpim.org/developer.html">here</a>, or
> you can build directly from the source tarball. (Instructions still to
> be written...)
>
> Source: http://prdownloads.sourceforge.net/wxpython/wxPython-src-2.8.1.1.tar.bz2
>
>
> The Required OpenRPG Files I sent to Tom (I'll actually send you a
> diff exe since that one still shows as OpenRPG+ (which is the
> developer version).
>
> Normally we have to update http://www.openrpg.com/orpg_packages.xml to
> point to the correct zip file. I would actually recommend against
> updating the zip it points to as the users are required to update
> Python and wxPython with this release as well. Instead I would update
> the file to look like
>
> <orpg_packages>
> <orpg_package version="1.7.1" build="070215-01" type="release"
> url="http://openrpg.sourceforge.net/openrpg-1.6.3.patch.zip"
> note="This update requires an update in Python and wxPython\n Please
> got http://www.openrpg.com/index.php?page=install to download the
> proper version of each and the OpenRPG Update.\n This system will not
> update your install due to the new requirments." />
> </orpg_packages>
>
> This will notify everyone with OpenRPG 1.6.3 that there is a new
> update available, and where to get it but will not download the
> update, which would break OpenRPG until they upgraded their Python and
> wxPython.
>
>
> Here is a Step by Step Upgrade Guide
>
> 1) Copy your myfiles folder, from your current OpenRPG install, to
> another location as backup.
>
> 2) Uninstall wxPython
>
> 3) Uninstall Python
>
> 4) Download the Python, wxPython, and OpenRPG from above that is
> proper for your system.
>
> 5) Install Python 2.5
>
> 6) Install wxPython 2.8
>
> 7) Install OpenRPG
>
> 8) Launch OpenRPG This will bring up an update window asking if you
> would like to update to the newest version, click on update now and it
> will download all of the updated files.
>
> 9) Copy your backed up myfiles folder over the new myfiles folder
>
> 10) You will need to redo your settings, Name, font color and such
>
> 11) You should be all done and ready to go
>
>
>
>
> On 2/16/07, chris davis <ch...@rp...> wrote:
> > Hmm..  I'm trying to think if I even remember.  Did I do the last
> > release or did someone else?
> >
> > On 2/16/07, Baleno <tb...@wr...> wrote:
> > > DJ sent me some files.  Anyone remember how to do a release ;) Also, before
> > > we do an official release do people want to try it on a mac to make sure
> > > there aren't any showstoppers?
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys-and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Openrpg-dev mailing list
> Ope...@li...
> https://lists.sourceforge.net/lists/listinfo/openrpg-dev
>


-- 
Chris Davis
RPGObjects

[Openrpg-dev] rusty watershed

[Rogers <ob...@fi...>]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
<img alt="guerrilla" src="cid:par...@fi..."
 height="278" width="290"><br>
Fifty iPod nanos will be awarded to the winners and there is no limit to
the number of nanos you can win. "He's got some scoring talent, he's got
some offence to him, works very hard and he's an energy hockey player,
so we thought he was a good fit for our hockey club," Muckler said.
Store your case with the headphones wrapped to the side, or carry your
iPod discreetly around town. But the findings should not be considered
licence to overindulge at the dairy bar, doctors say. "It's good that
everybody there expects to play in the finals of the Stanley Cup.<br>
We were a good hockey club before the trade deadline, I think we're a
little better now.<br>
But in the same breath, we have to make decisions we think can bolster
the team and help it eventually win. The first available report is a
kinship report that lists all related persons to the currently selected
family.<br>
He was a big fan favourite and it made the decision that much more
difficult.<br>
"Meehan said both he and the Oilers tried to find some common financial
ground, but could not. Also, Unix mailbox files can be imported into
DEVONthink Professional Office by drag-and-drop, the OCR process is more
reliable, and some minor interface glitches have been polished.<br>
's Mac computers could allow a malicious individual to increase their
access privileges on a targeted machine. 97 GAA and four shutouts this
season at home, where he's limited Minnesota to two goals in two
games.<br>
But in the same breath, we have to make decisions we think can bolster
the team and help it eventually win. Some of the changes in version
1.<br>
Complications higher for obese women after hip surgery Complications
after hip replacement surgery tend to be more common among patients who
are obese, especially women, a study suggests.<br>
"In 43 games this season, the 26-year-old Hale has one assist and 26
minutes in penalties.<br>
"But I understand that, with all due respect, they have the ability to
make these decisions and that's what management has to do in these
circumstances.<br>
Smyth, 31, is widely considered one of the NHL's hardest-working
forwards and he offers the Islanders a unique blend of grit, leadership
and scoring prowess.<br>
11, the East and West Division finals on Nov.<br>
In 313 career games, he has 54 goals and 81 assists.<br>
Bott launch Sidewinder SpectraMyPublisher launches free new BookMaker 2.
"Meehan said both he and the Oilers tried to find some common financial
ground, but could not.<br>
kicker Paul McCallum nailed all six of his field-goal attempts in a
25-14 victory over Montreal in the 94th Grey Cup in Winnipeg last
November. and one of the cars was leaking hydrochloric acid into a ditch
beside the Kicking Horse River.<br>
"We're not insensitive to our fans, by any stretch. A clear front face
and iPod-matching colors on the back allow you to show off and protect
your investment at the same time. Some of the changes in version 1.<br>
The native of Banff, Alta. "We know that's a big part of it. 's
antivirus program for Apple Inc.<br>
"I think if the figure gets out, all hell will break loose, and now I
think they're probably rejigging the numbers," McCluskey said.<br>
</body>
</html>

[Openrpg-dev] good misdoin

[Xandra C. <sl...@ya...>]

Hi,

Chaepest CALIS and VAGRA online.

http://parkerokay+now.com

Remove "+" from the link.


Moody, it is very important. Whod want to break into your office? 
A student, I daresay,  said Snape. Harry could see a vein flickering
horribly on Snapes greasy temple. It has happened before. Potion

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.103,1.104

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13111/orpg

Modified Files:
	orpg_version.py 
Log Message:


Index: orpg_version.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** orpg_version.py	21 Feb 2007 16:02:32 -0000	1.103
--- orpg_version.py	27 Feb 2007 03:12:06 -0000	1.104
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070221-01"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070226-00"
  
  

[Openrpg-dev] openrpg1/orpg/networking mplay_server.py, 1.133.2.1, 1.133.2.2

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/networking
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12355/orpg/networking

Modified Files:
      Tag: BRANCH-1-7-1
	mplay_server.py 
Log Message:
Fixed a bug in the Remote Ban command (02/26/2007)

Index: mplay_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v
retrieving revision 1.133.2.1
retrieving revision 1.133.2.2
diff -C2 -d -r1.133.2.1 -r1.133.2.2
*** mplay_server.py	17 Feb 2007 06:09:32 -0000	1.133.2.1
--- mplay_server.py	27 Feb 2007 03:10:22 -0000	1.133.2.2
***************
*** 2508,2512 ****
              elif cmd == "ban":
                  id = xml_dom.getAttribute("bid")
!                 msg = "<msg to='" + bid + "' from='0' group_id='" + gid + "'> Banned!"
                  self.players[pid].outbox.put(msg)
                  self.admin_ban(id, "")
--- 2508,2512 ----
              elif cmd == "ban":
                  id = xml_dom.getAttribute("bid")
!                 msg = "<msg to='" + id + "' from='0' group_id='" + gid + "'> Banned!"
                  self.players[pid].outbox.put(msg)
                  self.admin_ban(id, "")

[Openrpg-dev] openrpg1/orpg/networking mplay_server.py, 1.135, 1.136

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/networking
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11869/orpg/networking

Modified Files:
	mplay_server.py 
Log Message:
Fixed a bug in the Remote Ban command

Index: mplay_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** mplay_server.py	18 Feb 2007 16:14:46 -0000	1.135
--- mplay_server.py	27 Feb 2007 03:09:06 -0000	1.136
***************
*** 2531,2535 ****
              elif cmd == "ban":
                  id = xml_dom.getAttribute("bid")
!                 msg = "<msg to='" + bid + "' from='0' group_id='" + gid + "'> Banned!"
                  self.players[pid].outbox.put(msg)
                  self.admin_ban(id, "")
--- 2531,2535 ----
              elif cmd == "ban":
                  id = xml_dom.getAttribute("bid")
!                 msg = "<msg to='" + id + "' from='0' group_id='" + gid + "'> Banned!"
                  self.players[pid].outbox.put(msg)
                  self.admin_ban(id, "")

[Openrpg-dev] openrpg1/orpg/tools aliaslib.py,1.16,1.17

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11423/orpg/tools

Modified Files:
	aliaslib.py 
Log Message:


Index: aliaslib.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/aliaslib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aliaslib.py	16 Feb 2007 05:15:26 -0000	1.16
--- aliaslib.py	27 Feb 2007 03:08:07 -0000	1.17
***************
*** 696,703 ****
  
      def MakeSafeHTML(self, str):
!         return str.replace("&amp;", "&").replace("&lt;", "<").replace("&quot;", '"').replace("&gt;", ">")
  
      def MakeHTMLSafe(self, str):
!         return str.replace("&", "&amp;").replace("<", "&lt;").replace('"', "&quot;").replace(">", "&gt;")
  
      def ImportFromTree(self, xml_dom):
--- 696,703 ----
  
      def MakeSafeHTML(self, str):
!         return str.replace("&amp;", "&").replace("&lt;", "<").replace("&quot;", '"').replace("&gt;", ">").replace("&#39;", "'")
  
      def MakeHTMLSafe(self, str):
!         return str.replace("&", "&amp;").replace("<", "&lt;").replace('"', "&quot;").replace(">", "&gt;").replace("'", "&#39;")
  
      def ImportFromTree(self, xml_dom):

[Openrpg-dev] openrpg1/orpg/map __init__.py, 1.13, 1.14 _canvas.py, 1.2, 1.3 _circles.py, 1.8, 1.9 _fog.py, 1.7, 1.8 _grid.py, 1.7, 1.8 _lines.py, 1.5, 1.6 _object.py, 1.3, 1.4 _text.py, 1.4, 1.5

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/map
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11188/orpg/map

Modified Files:
	__init__.py _canvas.py _circles.py _fog.py _grid.py _lines.py 
	_object.py _text.py 
Log Message:


Index: _lines.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_lines.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** _lines.py	21 Feb 2007 15:22:06 -0000	1.5
--- _lines.py	27 Feb 2007 03:07:37 -0000	1.6
***************
*** 1,6 ****
  from math import sqrt
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  
--- 1,7 ----
  from math import sqrt
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  

Index: _canvas.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_canvas.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _canvas.py	21 Feb 2007 14:02:11 -0000	1.2
--- _canvas.py	27 Feb 2007 03:07:37 -0000	1.3
***************
*** 3,8 ****
  import xml.dom.minidom as minidom
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex
--- 3,9 ----
  import xml.dom.minidom as minidom
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex

Index: _grid.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_grid.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _grid.py	19 Feb 2007 16:33:20 -0000	1.7
--- _grid.py	27 Feb 2007 03:07:37 -0000	1.8
***************
*** 1,4 ****
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex
--- 1,5 ----
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex

Index: _fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_fog.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _fog.py	21 Feb 2007 14:02:11 -0000	1.7
--- _fog.py	27 Feb 2007 03:07:37 -0000	1.8
***************
*** 1,6 ****
  from math import sqrt
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  
--- 1,7 ----
  from math import sqrt
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  

Index: __init__.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/__init__.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** __init__.py	20 Feb 2007 10:19:53 -0000	1.13
--- __init__.py	27 Feb 2007 03:07:37 -0000	1.14
***************
*** 3,8 ****
  import xml.dom.minidom as minidom
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex
--- 3,9 ----
  import xml.dom.minidom as minidom
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex

Index: _text.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_text.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** _text.py	21 Feb 2007 14:02:11 -0000	1.4
--- _text.py	27 Feb 2007 03:07:37 -0000	1.5
***************
*** 1,6 ****
  from math import sqrt
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  
--- 1,7 ----
  from math import sqrt
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  

Index: _object.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_object.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _object.py	21 Feb 2007 14:02:11 -0000	1.3
--- _object.py	27 Feb 2007 03:07:37 -0000	1.4
***************
*** 1,6 ****
  from math import sqrt
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex
--- 1,7 ----
  from math import sqrt
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  from orpg.tools.rgbhex import RGBHex

Index: _circles.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_circles.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _circles.py	21 Feb 2007 14:02:11 -0000	1.8
--- _circles.py	27 Feb 2007 03:07:37 -0000	1.9
***************
*** 1,6 ****
  from math import sqrt
  
  import orpg.dirpath
- from orpg.orpg_wx import *
  from orpg.orpgCore import *
  
--- 1,7 ----
  from math import sqrt
  
+ import wx
+ 
  import orpg.dirpath
  from orpg.orpgCore import *
  

[Openrpg-dev] openrpg1/orpg/chat chatwnd.py, 1.163, 1.164 commands.py, 1.76, 1.77

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg/chat
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10393/orpg/chat

Modified Files:
	chatwnd.py commands.py 
Log Message:
Added an /advfilter command. Turning this feature On will cause the chat filter to only affect text between quote marks

Index: commands.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/chat/commands.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** commands.py	7 Feb 2007 22:27:55 -0000	1.76
--- commands.py	27 Feb 2007 03:05:17 -0000	1.77
***************
*** 105,108 ****
--- 105,109 ----
          self.addcommand('/sound', self.on_sound, 'Sound_URL - Plays a sound for all clients in the room.')
          self.addcommand('/purge', self.on_purge, 'This will clear the entire chat window')
+         self.addcommand('/advfilter', self.on_filter, 'This will toggle the Advanced Filter')
  
  
***************
*** 137,140 ****
--- 138,165 ----
              self.chat.InfoPost(msg)
  
+     def on_filter(self, cmdargs):
+         print self.chat.advancedFilter
+         test = not self.chat.advancedFilter
+         print test
+ 
+         for tab in self.chat.parent.whisper_tabs:
+             tab.advancedFilter = not self.chat.advancedFilter
+ 
+         for tab in self.chat.parent.null_tabs:
+             tab.advancedFilter = not self.chat.advancedFilter
+ 
+         for tab in self.chat.parent.group_tabs:
+             tab.advancedFilter = not self.chat.advancedFilter
+ 
+         if self.chat.parent.GMChatPanel != None:
+             self.chat.parent.GMChatPanel.advancedFilter = not self.chat.advancedFilter
+ 
+         self.chat.advancedFilter = not self.chat.advancedFilter
+ 
+         if self.chat.advancedFilter:
+             self.chat.InfoPost("Advanced Filtering has been turned On")
+         else:
+             self.chat.InfoPost("Advanced Filtering has been turned Off")
+ 
      def on_purge(self, cmdargs):
          self.chat.PurgeChat()

Index: chatwnd.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/chat/chatwnd.py,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** chatwnd.py	21 Feb 2007 16:00:26 -0000	1.163
--- chatwnd.py	27 Feb 2007 03:05:16 -0000	1.164
***************
*** 181,185 ****
      def OnLinkClicked(self, linkinfo):
          href = linkinfo.GetHref()
!         webbrowser.open(href)
      # def OnLinkClicked - end
  
--- 181,186 ----
      def OnLinkClicked(self, linkinfo):
          href = linkinfo.GetHref()
!         wb = webbrowser.get()
!         wb.open(href)
      # def OnLinkClicked - end
  
***************
*** 499,502 ****
--- 500,504 ----
          self.defaultAliasName = 'Use Real Name'
          self.defaultFilterName = 'No Filter'
+         self.advancedFilter = False
  
          self.lastSend = 0         #  this is used to help implement the player typing indicator
***************
*** 510,513 ****
--- 512,516 ----
  
  
+ 
          # html font/fontsize is global to all the notebook tabs.
          StartupFont = self.settings.get_setting("defaultfont")
***************
*** 1790,1798 ****
          self.log.log("Enter chat_panel->GetFilteredText(self, text)", ORPG_DEBUG)
  
          self.AliasLib = self.openrpg.get_component('alias')
          if self.AliasLib != None:
              self.AliasLib.filter = self.filterList.GetSelection()-1;
              for rule in self.AliasLib.filterRegEx:
!                 text = re.sub(rule[0], rule[1], text)
  
          self.log.log("Exit chat_panel->GetFilteredText(self, text)", ORPG_DEBUG)
--- 1793,1809 ----
          self.log.log("Enter chat_panel->GetFilteredText(self, text)", ORPG_DEBUG)
  
+         advregex = re.compile('\"(.*?)\"', re.I)
+ 
          self.AliasLib = self.openrpg.get_component('alias')
          if self.AliasLib != None:
              self.AliasLib.filter = self.filterList.GetSelection()-1;
              for rule in self.AliasLib.filterRegEx:
!                 if not self.advancedFilter:
!                     text = re.sub(rule[0], rule[1], text)
!                 else:
!                     for m in advregex.finditer(text):
!                         match = m.group(0)
!                         newmatch = re.sub(rule[0], rule[1], match)
!                         text = text.replace(match, newmatch)
  
          self.log.log("Exit chat_panel->GetFilteredText(self, text)", ORPG_DEBUG)

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.102,1.103

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15559/orpg

Modified Files:
	orpg_version.py 
Log Message:


Index: orpg_version.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/orpg_version.py,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** orpg_version.py	21 Feb 2007 15:16:21 -0000	1.102
--- orpg_version.py	21 Feb 2007 16:02:32 -0000	1.103
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070221-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070221-01"