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

[Openrpg-dev] openrpg1/orpg/mapper map.py,1.67,1.67.2.1

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

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

Modified Files:
      Tag: BRANCH-1-7-1
	map.py 
Log Message:
Fixed a bug that allowed lurkers to add minitures to the map

Index: map.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/map.py,v
retrieving revision 1.67
retrieving revision 1.67.2.1
diff -C2 -d -r1.67 -r1.67.2.1
*** map.py	14 Feb 2007 07:00:43 -0000	1.67
--- map.py	4 Apr 2007 01:37:28 -0000	1.67.2.1
***************
*** 133,137 ****
  
          self.session = self.openrpg.get_component("session")
!         if (self.session.my_role() != self.session.ROLE_GM or self.session.my_role() != self.session.ROLE_PLAYER) and (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
              cidx = self.parent.get_tab_index("Background")
              self.parent.layer_tabs.Enable(cidx, False)
--- 133,137 ----
  
          self.session = self.openrpg.get_component("session")
!         if self.session.my_role() == self.session.ROLE_LURKER or (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
              cidx = self.parent.get_tab_index("Background")
              self.parent.layer_tabs.Enable(cidx, False)

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.113,1.114

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

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11267/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.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** orpg_version.py	30 Mar 2007 20:29:11 -0000	1.113
--- orpg_version.py	4 Apr 2007 01:21:08 -0000	1.114
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070330-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070403-00"
  
  

[Openrpg-dev] openrpg1/orpg/networking meta_server_lib.py, 1.39, 1.40 mplay_server.py, 1.143, 1.144

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

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

Modified Files:
	meta_server_lib.py mplay_server.py 
Log Message:
Added some check to the Meta registration

Index: mplay_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** mplay_server.py	3 Apr 2007 00:14:35 -0000	1.143
--- mplay_server.py	4 Apr 2007 01:18:42 -0000	1.144
***************
*** 747,753 ****
          #  request only Meta servers compatible with version 2
          metalist = getMetaServers(versions=["2"])
!         if self.show_meta_messages != 0: self.log_msg("Found these valid metas:")
!         for meta in metalist:
!             if self.show_meta_messages != 0: self.log_msg("Meta:" + meta)
  
          #  Go through the list and see if there is already a running register
--- 747,754 ----
          #  request only Meta servers compatible with version 2
          metalist = getMetaServers(versions=["2"])
!         if self.show_meta_messages != 0:
!             self.log_msg("Found these valid metas:")
!             for meta in metalist:
!                 self.log_msg("Meta:" + meta)
  
          #  Go through the list and see if there is already a running register
***************
*** 772,776 ****
          for meta in metalist:
              if self.metas.has_key(meta) and self.metas[meta] and self.metas[meta].isAlive():
!                 self.metas[meta].register(name=name,realHostName=self.server_address,num_users=num_players)
              else:
                  self.metas[meta] = registerThread(name=name, realHostName=self.server_address, num_users=num_players, MetaPath=meta, port=self.server_port,register_callback=self.register_callback)
--- 773,777 ----
          for meta in metalist:
              if self.metas.has_key(meta) and self.metas[meta] and self.metas[meta].isAlive():
!                 self.metas[meta].register(name=name, realHostName=self.server_address, num_users=num_players)
              else:
                  self.metas[meta] = registerThread(name=name, realHostName=self.server_address, num_users=num_players, MetaPath=meta, port=self.server_port,register_callback=self.register_callback)

Index: meta_server_lib.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/meta_server_lib.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** meta_server_lib.py	4 Nov 2006 21:24:22 -0000	1.39
--- meta_server_lib.py	4 Apr 2007 01:18:42 -0000	1.40
***************
*** 518,527 ****
      #  re-registers this server and sleeps Interval
      #  minutes until the thread is ordered to die in place
- 
          while(not self.TestDeleteStatus()):         # Loop while until told to die
- 
- 
              #  Otherwise, call thread safe register().
              self.register(self.name, self.realHostName, self.num_users)
  
              #  register() will end up setting the state variables
--- 518,525 ----
      #  re-registers this server and sleeps Interval
      #  minutes until the thread is ordered to die in place
          while(not self.TestDeleteStatus()):         # Loop while until told to die
              #  Otherwise, call thread safe register().
              self.register(self.name, self.realHostName, self.num_users)
+             if META_DEBUG: print "Sent Registration Data"
  
              #  register() will end up setting the state variables
***************
*** 534,542 ****
                      self.interval -= 1          #  wake up with 30 seconds left to re-register
                  else:
!                     self.interval = .1           #  Otherwise, we probably experienced some kind
                                                  #  of error from the Meta in register().  Sleep
                                                  #  for 6 seconds and start from scratch.
  
- 
              finally:                            # no matter what, release the lock
                  self.rlock.release()
--- 532,539 ----
                      self.interval -= 1          #  wake up with 30 seconds left to re-register
                  else:
!                     self.interval = .5           #  Otherwise, we probably experienced some kind
                                                  #  of error from the Meta in register().  Sleep
                                                  #  for 6 seconds and start from scratch.
  
              finally:                            # no matter what, release the lock
                  self.rlock.release()
***************
*** 565,570 ****
          #  the code in Entry() to exit() when the thread wakes up and
          #  checks TestDeleteStatus().
- 
- 
          #  lock the critical section.  The unlock will
          #  automatically occur at the end of the function in the finally clause
--- 562,565 ----
***************
*** 583,590 ****
  
              try:
! 
!                 xml_dom = get_server_dom( data=data,path=self.path )  #  this POSTS the request and returns the result
                  if xml_dom.hasAttribute("errmsg"):
!                     if META_DEBUG: print "Error message returned from Meta:  " + xml_dom.getAttribute("errmsg")
  
              except:
--- 578,584 ----
  
              try:
!                 xml_dom = get_server_dom(data=data, path=self.path)  #  this POSTS the request and returns the result
                  if xml_dom.hasAttribute("errmsg"):
!                     print "Error durring unregistration:  " + xml_dom.getAttribute("errmsg")
  
              except:
***************
*** 610,614 ****
              self.rlock.release()
  
!     def register(self,name = None, realHostName=None, num_users = None):
          #  Designed to handle the registration, both new and
          #  repeated.
--- 604,608 ----
              self.rlock.release()
  
!     def register(self, name=None, realHostName=None, num_users=None):
          #  Designed to handle the registration, both new and
          #  repeated.
***************
*** 644,648 ****
  
              else:
! #                print "Letting meta server decide the hostname to list..."
                  data = urllib.urlencode( {"server_data[id]":self.id,
                                          "server_data[cookie]":self.cookie,
--- 638,642 ----
  
              else:
!                 if META_DEBUG:  print "Letting meta server decide the hostname to list..."
                  data = urllib.urlencode( {"server_data[id]":self.id,
                                          "server_data[cookie]":self.cookie,
***************
*** 654,664 ****
  
              try:
!                 xml_dom = get_server_dom( data=data,path=self.path )  #  this POSTS the request and returns the result
  
              except:
                  if META_DEBUG: print "Problem talking to server.  Setting interval for retry ..."
                  self.interval = 0
-                 if self.register_callback:                 #  if a callback is registered, call it
-                     self.register_callback(None, self.path)
                  #  If we are in the registerThread thread, then setting interval to 0
                  #  will end up causing a retry in about 6 seconds (see self.run())
--- 648,658 ----
  
              try:
!                 xml_dom = get_server_dom(data=data,path=self.path)  #  this POSTS the request and returns the result
  
              except:
                  if META_DEBUG: print "Problem talking to server.  Setting interval for retry ..."
+                 if META_DEBUG: print data
+                 if META_DEBUG: print
                  self.interval = 0
                  #  If we are in the registerThread thread, then setting interval to 0
                  #  will end up causing a retry in about 6 seconds (see self.run())
***************
*** 677,688 ****
              #  If there is a DOM returned ....
              if xml_dom:
- 
-                 if self.register_callback:                      #  if a callback is registered, call it
-                     self.register_callback(xml_dom, self.path)
- 
- 
                  #  If there's an error, echo it to the console
                  if xml_dom.hasAttribute("errmsg"):
!                     print "Error message returned from Meta:  " + xml_dom.getAttribute("errmsg")
  
                  #  No special handling is required.  If the registration worked, id, cookie, and interval
--- 671,679 ----
              #  If there is a DOM returned ....
              if xml_dom:
                  #  If there's an error, echo it to the console
                  if xml_dom.hasAttribute("errmsg"):
!                     print "Error durring registration:  " + xml_dom.getAttribute("errmsg")
!                     if META_DEBUG: print data
!                     if META_DEBUG: print
  
                  #  No special handling is required.  If the registration worked, id, cookie, and interval

[Openrpg-dev] openrpg1/orpg/mapper fog.py,1.34,1.35

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

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

Modified Files:
	fog.py 
Log Message:
Fixed a bug in the fog that made it not zoom properly

Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** fog.py	30 Mar 2007 20:14:42 -0000	1.34
--- fog.py	4 Apr 2007 01:16:47 -0000	1.35
***************
*** 225,233 ****
              return
  
!         if self.last_role!=self.canvas.frame.session.role:
              self.fill_fog()
  
          if "__WXGTK__" not in wx.PlatformInfo:
!             self.canvas.PrepareDC(dc)
              gc = wx.GraphicsContext.Create(dc)
              gc.SetBrush(wx.Brush(wx.BLACK))
--- 225,233 ----
              return
  
!         if self.last_role != self.canvas.frame.session.role:
              self.fill_fog()
  
          if "__WXGTK__" not in wx.PlatformInfo:
!             #self.canvas.PrepareDC(dc)
              gc = wx.GraphicsContext.Create(dc)
              gc.SetBrush(wx.Brush(wx.BLACK))

[Openrpg-dev] openrpg1/orpg/dirpath dirpath_tools.py, 1.13, 1.13.2.1

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

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

Modified Files:
      Tag: BRANCH-1-7-1
	dirpath_tools.py 
Log Message:
Made it so the dirpath_tools did not require wxPython

Index: dirpath_tools.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dirpath/dirpath_tools.py,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** dirpath_tools.py	18 Oct 2006 21:50:11 -0000	1.13
--- dirpath_tools.py	4 Apr 2007 01:15:20 -0000	1.13.2.1
***************
*** 4,10 ****
  from orpg.orpg_wx import *
  
! class tmpApp(wx.App):
!     def OnInit(self):
!         return True
  
  
--- 4,11 ----
  from orpg.orpg_wx import *
  
! if WXLOADED:
!     class tmpApp(wx.App):
!         def OnInit(self):
!             return True
  
  
***************
*** 70,84 ****
          #Check and temporarily add one if needed
          if (path[(len(path)-len(os.sep)):] != os.sep):
!             path=path+os.sep
  
          # These files should always exist at the root orpg dir
!         check_files=["start.py","platform.py","pyver.py"]
          for n in range(len(check_files)):
!             if not verify_file(path+check_files[n]): return 0
  
-         # These directories should always exist at the root orpg dir
-         check_dirs=["orpg","data","images"]
-         for n in range(len(check_dirs)):
-             if not verify_file(path+check_dirs[n]): return 0
      except:
          # an error occured while verifying the directory structure
--- 71,81 ----
          #Check and temporarily add one if needed
          if (path[(len(path)-len(os.sep)):] != os.sep):
!             path = path + os.sep
  
          # These files should always exist at the root orpg dir
!         check_files = ["start.py","platform.py","pyver.py", "orpg","data","images"]
          for n in range(len(check_files)):
!             if not verify_file(path + check_files[n]): return 0
  
      except:
          # an error occured while verifying the directory structure
***************
*** 115,139 ****
      and show directory selection dialog """
  
!     app = tmpApp(0)
!     app.MainLoop()
  
!     dir = None
  
!     try:
!         msg = "OpenRPG cannot locate critical files.\nPlease locate the openrpg1 directory in the following window"
!         alert= wx.MessageDialog(None,msg,"Warning",wx.OK|wx.ICON_ERROR)
!         alert.Show()
!         if alert.ShowModal() == wx.OK:
!             alert.Destroy()
!         dlg = wx.DirDialog(None, "Locate the openrpg1 directory:",style=wx.DD_DEFAULT_STYLE)
!         if dlg.ShowModal() == wx.ID_OK:
!             dir = dlg.GetPath()
!         dlg.Destroy()
!         app.Destroy()
          return dir
-     except Exception, e:
-         print e
-         print "OpenRPG encountered a problem while attempting to load file dialog to locate the OpenRPG root directory."
-         print "please delete the files ./openrpg/orpg/dirpath/aproot.py and ./openrpg/orpg/dirpath/aproot.pyc and try again."
  
  
--- 112,140 ----
      and show directory selection dialog """
  
!     if WXLOADED:
!         app = tmpApp(0)
!         app.MainLoop()
  
!         dir = None
  
!         try:
!             msg = "OpenRPG cannot locate critical files.\nPlease locate the openrpg1 directory in the following window"
!             alert= wx.MessageDialog(None,msg,"Warning",wx.OK|wx.ICON_ERROR)
!             alert.Show()
!             if alert.ShowModal() == wx.OK:
!                 alert.Destroy()
!             dlg = wx.DirDialog(None, "Locate the openrpg1 directory:",style=wx.DD_DEFAULT_STYLE)
!             if dlg.ShowModal() == wx.ID_OK:
!                 dir = dlg.GetPath()
!             dlg.Destroy()
!             app.Destroy()
!             return dir
!         except Exception, e:
!             print e
!             print "OpenRPG encountered a problem while attempting to load file dialog to locate the OpenRPG root directory."
!             print "please delete the files ./openrpg/orpg/dirpath/aproot.py and ./openrpg/orpg/dirpath/aproot.pyc and try again."
!     else:
!         dir = raw_input("Enter the full path to your openrpg folder:  ")
          return dir
  
  
***************
*** 149,156 ****
          if (orpg_root_path[(len(orpg_root_path)-len(os.sep)):] == os.sep):
              orpg_root_path = orpg_root_path[:(len(orpg_root_path)-len(os.sep))]
!         fn = orpg_root_path+os.sep+"orpg"+os.sep+"dirpath"+os.sep+"approot.py"
!         f = open( fn, "w")
          #trim off the appended os.sep character(s) to avoid duplicating them on re-loading of path
!         code="basedir = \""+orpg_root_path+"\"\n"
          #fix path string for windows boxes that lamely use an escape character for a path separator
          code = str.replace(code,'\\','\\\\')
--- 150,157 ----
          if (orpg_root_path[(len(orpg_root_path)-len(os.sep)):] == os.sep):
              orpg_root_path = orpg_root_path[:(len(orpg_root_path)-len(os.sep))]
!         fn = orpg_root_path + os.sep + "orpg" + os.sep + "dirpath" + os.sep + "approot.py"
!         f = open(fn, "w")
          #trim off the appended os.sep character(s) to avoid duplicating them on re-loading of path
!         code = 'basedir = "' + orpg_root_path + '"' + "\n"
          #fix path string for windows boxes that lamely use an escape character for a path separator
          code = str.replace(code,'\\','\\\\')

[Openrpg-dev] openrpg1/orpg/dirpath dirpath_tools.py,1.13,1.14

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

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

Modified Files:
	dirpath_tools.py 
Log Message:
Made it so the dirpath_tools did not require wxPython

Index: dirpath_tools.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/dirpath/dirpath_tools.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dirpath_tools.py	18 Oct 2006 21:50:11 -0000	1.13
--- dirpath_tools.py	4 Apr 2007 01:14:43 -0000	1.14
***************
*** 4,10 ****
  from orpg.orpg_wx import *
  
! class tmpApp(wx.App):
!     def OnInit(self):
!         return True
  
  
--- 4,11 ----
  from orpg.orpg_wx import *
  
! if WXLOADED:
!     class tmpApp(wx.App):
!         def OnInit(self):
!             return True
  
  
***************
*** 70,84 ****
          #Check and temporarily add one if needed
          if (path[(len(path)-len(os.sep)):] != os.sep):
!             path=path+os.sep
  
          # These files should always exist at the root orpg dir
!         check_files=["start.py","platform.py","pyver.py"]
          for n in range(len(check_files)):
!             if not verify_file(path+check_files[n]): return 0
  
-         # These directories should always exist at the root orpg dir
-         check_dirs=["orpg","data","images"]
-         for n in range(len(check_dirs)):
-             if not verify_file(path+check_dirs[n]): return 0
      except:
          # an error occured while verifying the directory structure
--- 71,81 ----
          #Check and temporarily add one if needed
          if (path[(len(path)-len(os.sep)):] != os.sep):
!             path = path + os.sep
  
          # These files should always exist at the root orpg dir
!         check_files = ["start.py","platform.py","pyver.py", "orpg","data","images"]
          for n in range(len(check_files)):
!             if not verify_file(path + check_files[n]): return 0
  
      except:
          # an error occured while verifying the directory structure
***************
*** 115,139 ****
      and show directory selection dialog """
  
!     app = tmpApp(0)
!     app.MainLoop()
  
!     dir = None
  
!     try:
!         msg = "OpenRPG cannot locate critical files.\nPlease locate the openrpg1 directory in the following window"
!         alert= wx.MessageDialog(None,msg,"Warning",wx.OK|wx.ICON_ERROR)
!         alert.Show()
!         if alert.ShowModal() == wx.OK:
!             alert.Destroy()
!         dlg = wx.DirDialog(None, "Locate the openrpg1 directory:",style=wx.DD_DEFAULT_STYLE)
!         if dlg.ShowModal() == wx.ID_OK:
!             dir = dlg.GetPath()
!         dlg.Destroy()
!         app.Destroy()
          return dir
-     except Exception, e:
-         print e
-         print "OpenRPG encountered a problem while attempting to load file dialog to locate the OpenRPG root directory."
-         print "please delete the files ./openrpg/orpg/dirpath/aproot.py and ./openrpg/orpg/dirpath/aproot.pyc and try again."
  
  
--- 112,140 ----
      and show directory selection dialog """
  
!     if WXLOADED:
!         app = tmpApp(0)
!         app.MainLoop()
  
!         dir = None
  
!         try:
!             msg = "OpenRPG cannot locate critical files.\nPlease locate the openrpg1 directory in the following window"
!             alert= wx.MessageDialog(None,msg,"Warning",wx.OK|wx.ICON_ERROR)
!             alert.Show()
!             if alert.ShowModal() == wx.OK:
!                 alert.Destroy()
!             dlg = wx.DirDialog(None, "Locate the openrpg1 directory:",style=wx.DD_DEFAULT_STYLE)
!             if dlg.ShowModal() == wx.ID_OK:
!                 dir = dlg.GetPath()
!             dlg.Destroy()
!             app.Destroy()
!             return dir
!         except Exception, e:
!             print e
!             print "OpenRPG encountered a problem while attempting to load file dialog to locate the OpenRPG root directory."
!             print "please delete the files ./openrpg/orpg/dirpath/aproot.py and ./openrpg/orpg/dirpath/aproot.pyc and try again."
!     else:
!         dir = raw_input("Enter the full path to your openrpg folder:  ")
          return dir
  
  
***************
*** 149,156 ****
          if (orpg_root_path[(len(orpg_root_path)-len(os.sep)):] == os.sep):
              orpg_root_path = orpg_root_path[:(len(orpg_root_path)-len(os.sep))]
!         fn = orpg_root_path+os.sep+"orpg"+os.sep+"dirpath"+os.sep+"approot.py"
!         f = open( fn, "w")
          #trim off the appended os.sep character(s) to avoid duplicating them on re-loading of path
!         code="basedir = \""+orpg_root_path+"\"\n"
          #fix path string for windows boxes that lamely use an escape character for a path separator
          code = str.replace(code,'\\','\\\\')
--- 150,157 ----
          if (orpg_root_path[(len(orpg_root_path)-len(os.sep)):] == os.sep):
              orpg_root_path = orpg_root_path[:(len(orpg_root_path)-len(os.sep))]
!         fn = orpg_root_path + os.sep + "orpg" + os.sep + "dirpath" + os.sep + "approot.py"
!         f = open(fn, "w")
          #trim off the appended os.sep character(s) to avoid duplicating them on re-loading of path
!         code = 'basedir = "' + orpg_root_path + '"' + "\n"
          #fix path string for windows boxes that lamely use an escape character for a path separator
          code = str.replace(code,'\\','\\\\')

[Openrpg-dev] openrpg1/orpg/mapper map.py,1.69,1.70

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

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

Modified Files:
	map.py 
Log Message:
Changed the logic a little to make sure that all the map tabs were disabled if the player was a lurker

Index: map.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/map.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** map.py	10 Mar 2007 04:06:20 -0000	1.69
--- map.py	3 Apr 2007 00:21:43 -0000	1.70
***************
*** 133,137 ****
  
          self.session = self.openrpg.get_component("session")
!         if (self.session.my_role() != self.session.ROLE_GM or self.session.my_role() != self.session.ROLE_PLAYER) and (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
              cidx = self.parent.get_tab_index("Background")
              self.parent.layer_tabs.Enable(cidx, False)
--- 133,137 ----
  
          self.session = self.openrpg.get_component("session")
!         if self.session.my_role() == self.session.ROLE_LURKER or (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
              cidx = self.parent.get_tab_index("Background")
              self.parent.layer_tabs.Enable(cidx, False)

[Openrpg-dev] openrpg1/orpg/networking mplay_server.py, 1.142, 1.143

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

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

Modified Files:
	mplay_server.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: mplay_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/networking/mplay_server.py,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** mplay_server.py	16 Mar 2007 18:17:01 -0000	1.142
--- mplay_server.py	3 Apr 2007 00:14:35 -0000	1.143
***************
*** 704,708 ****
      def clean_published_servername(self, name):
          #clean name of all apostrophes and quotes
!         badchars = "\"\\`<>"
          for c in badchars:
              name = name.replace(c,"")
--- 704,708 ----
      def clean_published_servername(self, name):
          #clean name of all apostrophes and quotes
!         badchars = "\"\\`><"
          for c in badchars:
              name = name.replace(c,"")
***************
*** 1654,1658 ****
              boot_pwd = xml_dom.getAttribute("boot_pwd")
          xml_dom.unlink()
!         if group_id <> "0":
              self.handle_role(act, player, role, boot_pwd, group_id)
              self.log_msg(("role", (player, role)))
--- 1654,1658 ----
              boot_pwd = xml_dom.getAttribute("boot_pwd")
          xml_dom.unlink()
!         if group_id != "0":
              self.handle_role(act, player, role, boot_pwd, group_id)
              self.log_msg(("role", (player, role)))
***************
*** 1700,1704 ****
                          else:
                              del self.groups[group_id].voice[i]
!                     if (msg <> ""):
                          msg = "The following users may speak in this room: " + msg
                      else:
--- 1700,1704 ----
                          else:
                              del self.groups[group_id].voice[i]
!                     if (msg != ""):
                          msg = "The following users may speak in this room: " + msg
                      else:

[Openrpg-dev] openrpg1/orpg/tools metamenus.py, 1.4, 1.5 orpg_settings.py, 1.49, 1.50

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

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

Modified Files:
	metamenus.py orpg_settings.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: metamenus.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/metamenus.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** metamenus.py	18 Oct 2006 21:50:20 -0000	1.4
--- metamenus.py	3 Apr 2007 00:14:35 -0000	1.5
***************
*** 20,25 ****
    its label.
  
! - Supplies EVT_BEFOREMENU and EVT_AFTERMENU, events that are triggered right 
!   before and after, respectively, the triggering of a EVT_MENU-bound method 
    on selection of some menu item.
  
--- 20,25 ----
    its label.
  
! - Supplies EVT_BEFOREMENU and EVT_AFTERMENU, events that are triggered right
!   before and after, respectively, the triggering of a EVT_MENU-bound method
    on selection of some menu item.
  
***************
*** 28,32 ****
  
  - If your app is already i18n'd, menu items may be translated on the fly.
!   All you need to do is to write somewhere a .mo file containing the menu 
    translations.
  
--- 28,32 ----
  
  - If your app is already i18n'd, menu items may be translated on the fly.
!   All you need to do is to write somewhere a .mo file containing the menu
    translations.
  
***************
*** 146,155 ****
                  wx.MenuItem.SetFont for more information about this.
  
!     - xaccel:   (MenuBarEx only) allows one to bind events to 'items' that 
                  are not actually menu items, rather methods or functions that
                  are triggered when some key or combination of keys is
                  pressed.
  
!                 xaccel is a list of tuples (accel, function), where accel is 
                  a string following the accelerator syntax described in the
                  wx.Menu.Append docs and function is the function/method to be
--- 146,155 ----
                  wx.MenuItem.SetFont for more information about this.
  
!     - xaccel:   (MenuBarEx only) allows one to bind events to 'items' that
                  are not actually menu items, rather methods or functions that
                  are triggered when some key or combination of keys is
                  pressed.
  
!                 xaccel is a list of tuples (accel, function), where accel is
                  a string following the accelerator syntax described in the
                  wx.Menu.Append docs and function is the function/method to be
***************
*** 210,222 ****
  
  More about i18n:
!   If you want to get your menu items automatically translated, you'll need 
    to:
  
!   1. Create a directory named 'locale' under your app's directory, and under 
       the 'locale', create subdirectories named after the canonical names of
       the languages you're going to use (e. g., 'pt_BR', 'es_ES', etc.)
  
    2. Inside each of the subdirectories, write a gettext compiled catalog file
!      (e. g., "my_messages.mo") containing all of the menu labels translated 
       to the language represented by the subdirectory.
  
--- 210,222 ----
  
  More about i18n:
!   If you want to get your menu items automatically translated, you'll need
    to:
  
!   1. Create a directory named 'locale' under your app's directory, and under
       the 'locale', create subdirectories named after the canonical names of
       the languages you're going to use (e. g., 'pt_BR', 'es_ES', etc.)
  
    2. Inside each of the subdirectories, write a gettext compiled catalog file
!      (e. g., "my_messages.mo") containing all of the menu labels translated
       to the language represented by the subdirectory.
  
***************
*** 243,247 ****
    package. On the other hand, if by any reason you _don't_ want the menu
    items to be translated, you may pass a i18n=False kwarg to the constructor.
!   
    You can use metamenus itself directly from a command line to help on
    creating a gettext-parseable file based on the menus you wrote. For more
--- 243,247 ----
    package. On the other hand, if by any reason you _don't_ want the menu
    items to be translated, you may pass a i18n=False kwarg to the constructor.
! 
    You can use metamenus itself directly from a command line to help on
    creating a gettext-parseable file based on the menus you wrote. For more
***************
*** 432,443 ****
  #
  #     When you use this new style, Metamenus will check if the thing passed
! #     can be translated as an item kind (either wx.RADIO, "radio", etc.) or 
  #     not, and so will try to guess what to do with the thing. Note that if
! #     you want a status bar showing something like "radio", you'll not be 
  #     able to use this new style, but ("radio",) will still work for such
  #     purposes, though.
  #
  #   - xaccel, a new kwarg available in MenuBarEx, allows one to bind events
! #     to 'items' that are not actually menu items, rather methods or 
  #     functions that are triggered when some key or combination of keys is
  #     pressed.
--- 432,443 ----
  #
  #     When you use this new style, Metamenus will check if the thing passed
! #     can be translated as an item kind (either wx.RADIO, "radio", etc.) or
  #     not, and so will try to guess what to do with the thing. Note that if
! #     you want a status bar showing something like "radio", you'll not be
  #     able to use this new style, but ("radio",) will still work for such
  #     purposes, though.
  #
  #   - xaccel, a new kwarg available in MenuBarEx, allows one to bind events
! #     to 'items' that are not actually menu items, rather methods or
  #     functions that are triggered when some key or combination of keys is
  #     pressed.
***************
*** 505,509 ****
          args = (); kwargs = {}
          params = params + [None] * (3 - len(params))
!     
          if type(params[1]) == tuple:
              args = params[1]
--- 505,509 ----
          args = (); kwargs = {}
          params = params + [None] * (3 - len(params))
! 
          if type(params[1]) == tuple:
              args = params[1]
***************
*** 568,573 ****
          self.children.append(Item)
          return Item
!         
!     
      def GetRealLabel(self, i18n):
          if i18n:
--- 568,573 ----
          self.children.append(Item)
          return Item
! 
! 
      def GetRealLabel(self, i18n):
          if i18n:
***************
*** 644,648 ****
                  r = child; break
          return r
!         
  
      def GetPath(self):
--- 644,648 ----
                  r = child; break
          return r
! 
  
      def GetPath(self):
***************
*** 713,717 ****
          for acc, fctn in xaccel:
              flags, keyCode = self._parseEntry(acc)
!             if flags <> None and keyCode <> None:
                  n.append((flags, keyCode, fctn))
          self.xaccel = n
--- 713,717 ----
          for acc, fctn in xaccel:
              flags, keyCode = self._parseEntry(acc)
!             if flags != None and keyCode != None:
                  n.append((flags, keyCode, fctn))
          self.xaccel = n
***************
*** 752,756 ****
  
          flags, keyCode = self._parseEntry(accel)
!         if flags <> None and keyCode <> None:
              self.entries.append(wx.AcceleratorEntry(flags, keyCode, cmd))
  
--- 752,756 ----
  
          flags, keyCode = self._parseEntry(accel)
!         if flags != None and keyCode != None:
              self.entries.append(wx.AcceleratorEntry(flags, keyCode, cmd))
  
***************
*** 793,800 ****
              getattr(item, m)(kwargs[kw])
  
!     if margin <> wx.DEFAULT:
          item.SetMarginWidth(margin)
  
!     if font <> wx.NullFont:
          item.SetFont(font)
  
--- 793,800 ----
              getattr(item, m)(kwargs[kw])
  
!     if margin != wx.DEFAULT:
          item.SetMarginWidth(margin)
  
!     if font != wx.NullFont:
          item.SetFont(font)
  
***************
*** 1100,1104 ****
  
      # Public methods --------------------------------------------------------
!     
      def UpdateMenus(self):
          """
--- 1100,1104 ----
  
      # Public methods --------------------------------------------------------
! 
      def UpdateMenus(self):
          """
***************
*** 1106,1110 ****
          changes.
          """
!         
          if not self.i18n:
              return
--- 1106,1110 ----
          changes.
          """
! 
          if not self.i18n:
              return
***************
*** 1219,1223 ****
                  self.MenuStrings.update(child.GetAllMethods())
                  self.MenuList.append([Id, child.GetPath()])
!                 
          # Initialize menu states.
          self.MenuState = {}
--- 1219,1223 ----
                  self.MenuStrings.update(child.GetAllMethods())
                  self.MenuList.append([Id, child.GetPath()])
! 
          # Initialize menu states.
          self.MenuState = {}
***************
*** 1245,1249 ****
  
              for x in range(g.index(i), 0, -1):
!                 if g[x] <> None:
                      n.append(g[x])
                  else:
--- 1245,1249 ----
  
              for x in range(g.index(i), 0, -1):
!                 if g[x] != None:
                      n.append(g[x])
                  else:
***************
*** 1251,1255 ****
  
              for x in range(g.index(i) + 1, len(g)):
!                 if g[x] <> None:
                      n.append(g[x])
                  else:
--- 1251,1255 ----
  
              for x in range(g.index(i) + 1, len(g)):
!                 if g[x] != None:
                      n.append(g[x])
                  else:

Index: orpg_settings.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/tools/orpg_settings.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** orpg_settings.py	18 Feb 2007 16:14:47 -0000	1.49
--- orpg_settings.py	3 Apr 2007 00:14:35 -0000	1.50
***************
*** 394,398 ****
          row = evt.GetRow()
          col = evt.GetCol()
!         if col <> 1:
              return
          setting = self.GetCellValue(row,0)
--- 394,398 ----
          row = evt.GetRow()
          col = evt.GetCol()
!         if col != 1:
              return
          setting = self.GetCellValue(row,0)

[Openrpg-dev] openrpg1/orpg/chat commands.py,1.79,1.80

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

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

Modified Files:
	commands.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: commands.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/chat/commands.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** commands.py	10 Mar 2007 17:12:46 -0000	1.79
--- commands.py	3 Apr 2007 00:14:34 -0000	1.80
***************
*** 546,550 ****
  
      def on_moderate(self, cmdargs):
!         if cmdargs <> "":
              pos = cmdargs.find("=")
              if (pos < 0):
--- 546,550 ----
  
      def on_moderate(self, cmdargs):
!         if cmdargs != "":
              pos = cmdargs.find("=")
              if (pos < 0):
***************
*** 572,576 ****
                  msg += " action = '" + action + "'"
                  msg +=" from = '" + self.session.id + "' pwd='" + pwd + "'"
!                 if (plist <> ""):
                      msg += " users='"+plist+"'"
                  msg += " />"
--- 572,576 ----
                  msg += " action = '" + action + "'"
                  msg +=" from = '" + self.session.id + "' pwd='" + pwd + "'"
!                 if (plist != ""):
                      msg += " users='"+plist+"'"
                  msg += " />"

[Openrpg-dev] openrpg1/orpg/mapper grid_handler.py, 1.19, 1.20 map_handler.py, 1.13, 1.14 miniatures_handler.py, 1.37, 1.38

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

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

Modified Files:
	grid_handler.py map_handler.py miniatures_handler.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: miniatures_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/miniatures_handler.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** miniatures_handler.py	9 Mar 2007 14:11:55 -0000	1.37
--- miniatures_handler.py	3 Apr 2007 00:14:35 -0000	1.38
***************
*** 126,129 ****
--- 126,134 ----
  
      def on_browse(self, evt):
+         session = self.canvas.frame.session
+         if (session.my_role() != session.ROLE_GM) and (session.my_role() != session.ROLE_PLAYER) and (session.use_roles()):
+             self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
+             return
+ 
          dlg = wx.FileDialog(None, "Select a Miniture to load", wildcard="Image files (*.bmp, *.gif, *.jpg, *.png)|*.bmp;*.gif;*.jpg;*.png", style=wx.OPEN)
  
***************
*** 295,299 ****
      def on_left_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM) and (session.my_role() <> session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
--- 300,304 ----
      def on_left_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM) and (session.my_role() != session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
***************
*** 365,369 ****
      def on_right_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM) and (session.my_role()<>session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
--- 370,374 ----
      def on_right_down(self, evt):
          session = self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM) and (session.my_role()!=session.ROLE_PLAYER) and (session.use_roles()):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
***************
*** 413,417 ****
  
      def on_min_menu_item(self,evt):
- 
          id = evt.GetId()
          if id == MIN_REMOVE:
--- 418,421 ----
***************
*** 665,669 ****
      def on_min_list(self,evt):
          session = self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return
--- 669,673 ----
      def on_min_list(self,evt):
          session = self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return

Index: grid_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/grid_handler.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** grid_handler.py	9 Mar 2007 14:11:55 -0000	1.19
--- grid_handler.py	3 Apr 2007 00:14:35 -0000	1.20
***************
*** 89,93 ****
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return
--- 89,93 ----
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return

Index: map_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/map_handler.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** map_handler.py	12 Feb 2007 02:29:08 -0000	1.13
--- map_handler.py	3 Apr 2007 00:14:35 -0000	1.14
***************
*** 71,75 ****
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() <> session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return
--- 71,75 ----
      def on_apply(self, evt):
          session=self.canvas.frame.session
!         if (session.my_role() != session.ROLE_GM):
              self.top_frame.openrpg.get_component("chat").InfoPost("You must be a GM to use this feature")
              return

[Openrpg-dev] openrpg1/orpg/gametree/nodehandlers map_miniature_nodehandler.py, 1.14, 1.15 minilib.py, 1.24, 1.25

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

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

Modified Files:
	map_miniature_nodehandler.py minilib.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: map_miniature_nodehandler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers/map_miniature_nodehandler.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** map_miniature_nodehandler.py	4 Nov 2006 21:24:21 -0000	1.14
--- map_miniature_nodehandler.py	3 Apr 2007 00:14:35 -0000	1.15
***************
*** 131,135 ****
  
          new_xml = self.get_to_map_XML()
!         if (self.session.my_role() <> self.session.ROLE_GM) and (self.session.my_role() <> self.session.ROLE_PLAYER):
              self.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
--- 131,135 ----
  
          new_xml = self.get_to_map_XML()
!         if (self.session.my_role() != self.session.ROLE_GM) and (self.session.my_role() != self.session.ROLE_PLAYER):
              self.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return

Index: minilib.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers/minilib.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** minilib.py	4 Nov 2006 21:24:21 -0000	1.24
--- minilib.py	3 Apr 2007 00:14:35 -0000	1.25
***************
*** 206,210 ****
              return
          session = self.openrpg.get_component( COMPONENT_SESSION )
!         if (session.my_role() <> session.ROLE_GM) and (session.my_role()<>session.ROLE_PLAYER):
              self.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return
--- 206,210 ----
              return
          session = self.openrpg.get_component( COMPONENT_SESSION )
!         if (session.my_role() != session.ROLE_GM) and (session.my_role() != session.ROLE_PLAYER):
              self.openrpg.get_component("chat").InfoPost("You must be either a player or GM to use the miniature Layer")
              return

[Openrpg-dev] openrpg1/orpg/gametree gametree.py,1.65,1.66

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

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

Modified Files:
	gametree.py 
Log Message:
Fixed an issue that allowed Lurkers to load local minitures
Removed all instances of <> in the code as that is depreciated in python 2.5

Index: gametree.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/gametree.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** gametree.py	30 Mar 2007 20:19:44 -0000	1.65
--- gametree.py	3 Apr 2007 00:14:34 -0000	1.66
***************
*** 792,796 ****
                      status_value = "none"
                  parent_obj = parent_obj.master_dom._get_parentNode()
!                 while status_value<>"useful" and status_value<>"useless":
                      try:
                          status_value = parent_obj.getAttribute('status')
--- 792,796 ----
                      status_value = "none"
                  parent_obj = parent_obj.master_dom._get_parentNode()
!                 while status_value!="useful" and status_value!="useless":
                      try:
                          status_value = parent_obj.getAttribute('status')

[Openrpg-dev] openrpg1/orpg/gametree gametree.py, 1.63.2.1, 1.63.2.2

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

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

Modified Files:
      Tag: BRANCH-1-7-1
	gametree.py 
Log Message:
Fixed a bug when clicking in the tree but not on a node

Index: gametree.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/gametree.py,v
retrieving revision 1.63.2.1
retrieving revision 1.63.2.2
diff -C2 -d -r1.63.2.1 -r1.63.2.2
*** gametree.py	20 Feb 2007 10:17:44 -0000	1.63.2.1
--- gametree.py	30 Mar 2007 20:30:54 -0000	1.63.2.2
***************
*** 1033,1037 ****
              self.rename_flag = 0
              self.was_labeling = 0
!         elif self.IsSelected(item) and (flag & wx.TREE_HITTEST_ONITEMLABEL) == wx.TREE_HITTEST_ONITEMLABEL :
              #  this next if tests to ensure that the mouse up occurred over a label, and not the icon
              self.rename_flag = 1
--- 1033,1037 ----
              self.rename_flag = 0
              self.was_labeling = 0
!         elif (flag & wx.TREE_HITTEST_ONITEMLABEL) == wx.TREE_HITTEST_ONITEMLABEL and self.IsSelected(item):
              #  this next if tests to ensure that the mouse up occurred over a label, and not the icon
              self.rename_flag = 1

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.112,1.113

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

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31013/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.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** orpg_version.py	21 Mar 2007 15:39:04 -0000	1.112
--- orpg_version.py	30 Mar 2007 20:29:11 -0000	1.113
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070321-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070330-00"
  
  

[Openrpg-dev] openrpg1/orpg/gametree gametree.py,1.64,1.65

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

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

Modified Files:
	gametree.py 
Log Message:
Fixed a bug when clicking in the tree but not on a node

Index: gametree.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/gametree.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** gametree.py	19 Feb 2007 05:39:32 -0000	1.64
--- gametree.py	30 Mar 2007 20:19:44 -0000	1.65
***************
*** 1033,1037 ****
              self.rename_flag = 0
              self.was_labeling = 0
!         elif self.IsSelected(item) and (flag & wx.TREE_HITTEST_ONITEMLABEL) == wx.TREE_HITTEST_ONITEMLABEL :
              #  this next if tests to ensure that the mouse up occurred over a label, and not the icon
              self.rename_flag = 1
--- 1033,1037 ----
              self.rename_flag = 0
              self.was_labeling = 0
!         elif (flag & wx.TREE_HITTEST_ONITEMLABEL) == wx.TREE_HITTEST_ONITEMLABEL and self.IsSelected(item):
              #  this next if tests to ensure that the mouse up occurred over a label, and not the icon
              self.rename_flag = 1

[Openrpg-dev] openrpg1/orpg/mapper fog.py,1.33,1.34

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

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

Modified Files:
	fog.py 
Log Message:


Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** fog.py	30 Mar 2007 19:47:51 -0000	1.33
--- fog.py	30 Mar 2007 20:14:42 -0000	1.34
***************
*** 374,381 ****
  
          while ri.HaveRects():
!             x1 = ri.GetX()/COURSE
!             x2 = x1+(ri.GetW()/COURSE)-1
!             y1 = ri.GetY()/COURSE
!             y2 = y1+(ri.GetH()/COURSE)-1
              poly = FogArea(str(x1) + "," + str(y1) + ";" +
                            str(x2) + "," + str(y1) + ";" +
--- 374,388 ----
  
          while ri.HaveRects():
!             if "__WXGTK__" not in wx.PlatformInfo:
!                 x1 = ri.GetX()/COURSE
!                 x2 = x1+(ri.GetW()/COURSE)-1
!                 y1 = ri.GetY()/COURSE
!                 y2 = y1+(ri.GetH()/COURSE)-1
!             else:
!                 x1 = ri.GetX()
!                 x2 = x1+ri.GetW()-1
!                 y1 = ri.GetY()
!                 y2 = y1+ri.GetH()-1
! 
              poly = FogArea(str(x1) + "," + str(y1) + ";" +
                            str(x2) + "," + str(y1) + ";" +

[Openrpg-dev] openrpg1/plugins inittool2.txt,1.2,NONE

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

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

Removed Files:
	inittool2.txt 
Log Message:
Removed

--- inittool2.txt DELETED ---

[Openrpg-dev] openrpg1/orpg/mapper fog.py, 1.32, 1.33 fog_handler.py, 1.14, 1.15

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

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

Modified Files:
	fog.py fog_handler.py 
Log Message:
Fixed issue with saving maps then reloading them and the fog not showing

Index: fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** fog.py	10 Mar 2007 04:06:20 -0000	1.32
--- fog.py	30 Mar 2007 19:47:51 -0000	1.33
***************
*** 123,127 ****
          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()
          self.fogregion.Clear()
--- 123,127 ----
          self.color = wx.Color(128,128,128)
          if "__WXGTK__" not in wx.PlatformInfo:
!             self.color = wx.Color(128,128,128, 128)
          self.fogregion = wx.Region()
          self.fogregion.Clear()
***************
*** 229,232 ****
--- 229,233 ----
  
          if "__WXGTK__" not in wx.PlatformInfo:
+             self.canvas.PrepareDC(dc)
              gc = wx.GraphicsContext.Create(dc)
              gc.SetBrush(wx.Brush(wx.BLACK))
***************
*** 373,380 ****
  
          while ri.HaveRects():
!             x1 = ri.GetX()
!             x2 = x1+ri.GetW()-1
!             y1 = ri.GetY()
!             y2 = y1+ri.GetH()-1
              poly = FogArea(str(x1) + "," + str(y1) + ";" +
                            str(x2) + "," + str(y1) + ";" +
--- 374,381 ----
  
          while ri.HaveRects():
!             x1 = ri.GetX()/COURSE
!             x2 = x1+(ri.GetW()/COURSE)-1
!             y1 = ri.GetY()/COURSE
!             y2 = y1+(ri.GetH()/COURSE)-1
              poly = FogArea(str(x1) + "," + str(y1) + ";" +
                            str(x2) + "," + str(y1) + ";" +

Index: fog_handler.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/mapper/fog_handler.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** fog_handler.py	9 Mar 2007 14:11:55 -0000	1.14
--- fog_handler.py	30 Mar 2007 19:47:51 -0000	1.15
***************
*** 141,147 ****
      def on_motion(self, evt):
          scale = self.canvas.layers['grid'].mapscale
!         dc = wx.ClientDC( self.canvas )
!         self.canvas.PrepareDC( dc )
!         dc.SetUserScale(scale,scale)
          pos = evt.GetLogicalPosition(dc)
          pos.x /= COURSE
--- 141,147 ----
      def on_motion(self, evt):
          scale = self.canvas.layers['grid'].mapscale
!         dc = wx.ClientDC(self.canvas)
!         dc.SetUserScale(scale, scale)
!         self.canvas.PrepareDC(dc)
          pos = evt.GetLogicalPosition(dc)
          pos.x /= COURSE
***************
*** 151,162 ****
              if not self.drawing:
                  self.line = []
!                 self.line.append(IPoint().make(pos.x,pos.y))
!             elif pos.x!=self.last.x or pos.y!=self.last.y:
                  pen= wx.Pen(self.pencolor)
                  pen.SetWidth(COURSE/2+1)
                  dc.SetPen(pen)
!                 dc.DrawLine(self.last.x*COURSE,self.last.y*COURSE,pos.x*COURSE,pos.y*COURSE)
                  dc.SetPen(wx.NullPen)
!                 self.line.append(IPoint().make(pos.x,pos.y))
              self.last = pos
              self.drawing = True
--- 151,162 ----
              if not self.drawing:
                  self.line = []
!                 self.line.append(IPoint().make(pos.x, pos.y))
!             elif pos.x != self.last.x or pos.y != self.last.y:
                  pen= wx.Pen(self.pencolor)
                  pen.SetWidth(COURSE/2+1)
                  dc.SetPen(pen)
!                 dc.DrawLine(self.last.x*COURSE, self.last.y*COURSE, pos.x*COURSE, pos.y*COURSE)
                  dc.SetPen(wx.NullPen)
!                 self.line.append(IPoint().make(pos.x, pos.y))
              self.last = pos
              self.drawing = True
***************
*** 175,180 ****
                      showmode = 'del'
                  scale = self.canvas.layers['grid'].mapscale
!                 dc = wx.ClientDC( self.canvas )
!                 self.canvas.PrepareDC( dc )
                  dc.SetUserScale(scale,scale)
                  pen= wx.Pen(self.pencolor)
--- 175,180 ----
                      showmode = 'del'
                  scale = self.canvas.layers['grid'].mapscale
!                 dc = wx.ClientDC(self.canvas)
!                 self.canvas.PrepareDC(dc)
                  dc.SetUserScale(scale,scale)
                  pen= wx.Pen(self.pencolor)

[Openrpg-dev] openrpg1/plugins inittool2.xml, 1.2, 1.3 inittool2_player.xml, 1.1, 1.2 xxcherrypy.py, 1.9, 1.10 xxinit2.py, 1.5, 1.6

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

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

Modified Files:
	inittool2.xml inittool2_player.xml xxcherrypy.py xxinit2.py 
Log Message:
Cherrypy now remembers it's last state (on or off) -- Veggiesama
Updated to version 2.28 of the Init tool -- Veggiesama

Index: xxcherrypy.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/xxcherrypy.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** xxcherrypy.py	15 Nov 2006 12:11:26 -0000	1.9
--- xxcherrypy.py	30 Mar 2007 19:18:04 -0000	1.10
***************
*** 1,3 ****
--- 1,4 ----
  import os
+ import orpg.plugindb # VEG
  import orpg.pluginhandler
  import thread
***************
*** 5,8 ****
--- 6,11 ----
  import socket
  
+  # VEG (march 21, 2007): Now remembers your last web server on/off setting
+  
  class Plugin(orpg.pluginhandler.PluginHandler):
      # Initialization subroutine.
***************
*** 31,35 ****
              self.host = ip
              if ip[:7] == '192.168' or ip[:3] == '10.' or ip == '127.0.0.1' or (ip[:3] == '172' and (int(ip[5:6]) >= 16 and int(ip[5:6]) <=32)) :
!                 self.chat.InfoPost("[WARNING] Cherrypy has detected you may be behind a router, This is your internal IP. For other users to properly connect, you may have to use your external IP, with port forwarding on port XXXX [80?]<br />This feature is not suported in any way.")
  
  
--- 34,41 ----
              self.host = ip
              if ip[:7] == '192.168' or ip[:3] == '10.' or ip == '127.0.0.1' or (ip[:3] == '172' and (int(ip[5:6]) >= 16 and int(ip[5:6]) <=32)) :
!                 self.chat.InfoPost("[WARNING] Cherrypy has detected that you may be behind a router. This is your internal IP. For other users to properly connect, you may have to use your external IP, with port forwarding on port 80.<br />This feature is not suported in any way.")
! 
!         if str(self.plugindb.GetString("xxcherrypy", "auto_start", "off")) == "on":  # VEG
!             self.on_cherrypy("on")                                                   # VEG
  
  
***************
*** 52,55 ****
--- 58,62 ----
              self.webserver = thread.start_new_thread(self.startServer, (80,))
              self.isServerRunning = 'on'
+             self.plugindb.SetString("xxcherrypy", "auto_start", "on") # VEG
  
          elif args[0] == 'off' and self.isServerRunning == 'on':
***************
*** 57,60 ****
--- 64,69 ----
              self.isServerRunning = 'off'
              self.chat.InfoPost("CherryPy Web Server is now disabled")
+             self.plugindb.SetString("xxcherrypy", "auto_start", "off") # VEG
+ 
  
      def startServer(self, port):

Index: inittool2.xml
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** inittool2.xml	4 Feb 2007 15:58:02 -0000	1.2
--- inittool2.xml	30 Mar 2007 19:18:04 -0000	1.3
***************
*** 1,4 ****
  
! <nodehandler class="group_handler" icon="labtop" module="containers" name="GM's Initiative Tool v2.2.7" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="macro_handler" icon="oriental" module="chatmacro" name="Start/Clear" version="1.0">
--- 1,4 ----
  
! <nodehandler class="group_handler" icon="labtop" module="containers" name="GM's Initiative Tool" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="macro_handler" icon="oriental" module="chatmacro" name="Start/Clear" version="1.0">

Index: xxinit2.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/xxinit2.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xxinit2.py	4 Feb 2007 21:58:50 -0000	1.5
--- xxinit2.py	30 Mar 2007 19:18:04 -0000	1.6
***************
*** 30,34 ****
  import random
  
! __version__ = "2.2.7"
  
  class v:
--- 30,34 ----
  import random
  
! __version__ = "2.2.8"
  
  class v:
***************
*** 82,86 ****
          self.sandglass_status = 0# 0 = running, 1 = pause
          self.sandglass_skip_interval = 0 # after a number of interval, do a init_next(). 0 = disable
!         self.autosave_delay  = 0 # 0 = off, else, will autosave every 'autosave' seconds
          self.autosave_count  = 0 # current count of the number of seconds since last autosave
          self.hide_id       = 0 # 1 = do not show IDs to everyone; 0 = show IDs to everyone
--- 82,86 ----
          self.sandglass_status = 0# 0 = running, 1 = pause
          self.sandglass_skip_interval = 0 # after a number of interval, do a init_next(). 0 = disable
!         self.autosave_delay  = 60 # 0 = off, else, will autosave every 'autosave' seconds - VEG 2.2.8 (set to 60)
          self.autosave_count  = 0 # current count of the number of seconds since last autosave
          self.hide_id       = 0 # 1 = do not show IDs to everyone; 0 = show IDs to everyone
***************
*** 144,147 ****
--- 144,149 ----
          self.plugin_add_msg_handler("xxinit2_returnloaded", self.received_returnloaded) #VEG 2.2.6
  
+         self.init_load(0) #VEG 2.2.8 - auto-loads last autosave at startup (helps if you crash)
+ 
      def plugin_disabled(self):
          self.plugin_removecmd("/inittool2")
***************
*** 237,254 ****
                  if text.find(" effect ") != -1:
                      effect=text[text.rfind("'>")+2:text.find("[")]
!                     duration=text[text.rfind("effect ")+7:text.find("</font>")] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[:text.find("[")]
!                     passes=text[text.find("init ")+5:text.find("</font>")] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("(")+1:text.rfind(")")]
              else:
                  if text.find(" effect ") != -1:
                      effect=text[text.find("</b>: ")+6:text.find("[")]
!                     duration=text[text.find("effect ")+7:-7] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[text.find("</b>: ")+6:text.find("[")]
!                     passes=text[text.find("init ")+5:-7] # This line won't work with macros - VEG 2.2.7
                      init=text[text.rfind("(")+1:text.rfind(")")]
              try:
--- 239,256 ----
                  if text.find(" effect ") != -1:
                      effect=text[text.rfind("'>")+2:text.find("[")]
!                     duration=text[text.rfind("effect ")+7:text.find("</font>")]
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[:text.find("[")]
!                     passes=text[text.find("init ")+5:text.find("</font>")]
                      init=text[text.rfind("(")+1:text.rfind(")")]
              else:
                  if text.find(" effect ") != -1:
                      effect=text[text.find("</b>: ")+6:text.find("[")]
!                     duration=text[text.find("effect ")+7:-7]
                      init=text[text.rfind("=> ")+3:text.rfind(" effect")]
                  elif text.find(" init") != -1:
                      player=text[text.find("</b>: ")+6:text.find("[")]
!                     passes=text[text.find("init ")+5:-7]
                      init=text[text.rfind("(")+1:text.rfind(")")]
              try:
***************
*** 1626,1630 ****
            self.sandglass_status = 0
            self.sandglass_skip_interval = 0
!           self.autosave_delay = 300
            self.autosave_count = 0
            self.hide_id = 0
--- 1628,1632 ----
            self.sandglass_status = 0
            self.sandglass_skip_interval = 0
!           self.autosave_delay = 60
            self.autosave_count = 0
            self.hide_id = 0

Index: inittool2_player.xml
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/plugins/inittool2_player.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** inittool2_player.xml	4 Feb 2007 21:56:43 -0000	1.1
--- inittool2_player.xml	30 Mar 2007 19:18:04 -0000	1.2
***************
*** 1,4 ****
  
! <nodehandler class="group_handler" icon="player" module="containers" name="Player's Initiative Tool 2.2.7" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="textctrl_handler" icon="note" module="forms" name="READ ME FIRST!!" version="1.0">
--- 1,4 ----
  
! <nodehandler class="group_handler" icon="player" module="containers" name="Player's Initiative Tool" status="useful" version="1.0">
    <group_atts border="1" cols="1"/>
    <nodehandler class="textctrl_handler" icon="note" module="forms" name="READ ME FIRST!!" version="1.0">
***************
*** 26,29 ****
--- 26,35 ----
  --- For effects in particular, sometimes it's easier just to memorize the formula rather than change it every time you want to add something.</text>
    </nodehandler>
+   <nodehandler class="macro_handler" icon="die" module="chatmacro" name="Switch to D20 Dieroller" version="1.0">
+     <text>/dieroller d20</text>
+   </nodehandler>
+   <nodehandler class="macro_handler" icon="die" module="chatmacro" name="Switch to SR4 Dieroller" version="1.0">
+     <text>/dieroller sr4</text>
+   </nodehandler>
    <nodehandler class="macro_handler" icon="rome" module="chatmacro" name="Next Turn" version="1.0">
      <text>&lt;!---Advances the initiative to the next turn; use only at end of your turn and not other people's turns---&gt;
***************
*** 51,60 ****
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
    <nodehandler class="macro_handler" icon="wizard1" module="chatmacro" name="Roll Init (SR4 Astral)" version="1.0">
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
  </nodehandler>
\ No newline at end of file
--- 57,66 ----
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Virtual Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
    <nodehandler class="macro_handler" icon="wizard1" module="chatmacro" name="Roll Init (SR4 Astral)" version="1.0">
      <text>&lt;!---Name, space Initiative Roll in brackets, space the word &quot;init&quot;, space Initiative Passes---&gt;
  &lt;!---the Initiative Roll is [Xd6.init(Y)], where X is the number of dice you are rolling, and Y is your Initiative Score (usually both the same value)---&gt;
! Astral Veggiesama [5d6.init(5)] init 2</text>
    </nodehandler>
  </nodehandler>
\ No newline at end of file

[Openrpg-dev] openrpg1/orpg/map _canvas.py, 1.3, 1.4 _fog.py, 1.8, 1.9

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

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

Modified Files:
	_canvas.py _fog.py 
Log Message:
Some changes to get the Fog working on *nix and OSX

Index: _canvas.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_canvas.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _canvas.py	27 Feb 2007 03:07:37 -0000	1.3
--- _canvas.py	30 Mar 2007 19:13:03 -0000	1.4
***************
*** 17,23 ****
  from _fog import FogLayer
  
! USE_BUFFER = False
! if "wxMSW" in wx.PlatformInfo:
!     USE_BUFFER = True
  
  class MapCanvas(wx.ScrolledWindow):
--- 17,23 ----
  from _fog import FogLayer
  
! USE_BUFFER = True
! if "wxMAC" in wx.PlatformInfo:
!     USE_BUFFER = False
  
  class MapCanvas(wx.ScrolledWindow):

Index: _fog.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/map/_fog.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _fog.py	27 Feb 2007 03:07:37 -0000	1.8
--- _fog.py	30 Mar 2007 19:13:03 -0000	1.9
***************
*** 27,34 ****
          for point in self.canvas.fogRegion:
              if point == 's' or point == 'h':
!                 if lp == 's':
                      self.region.XorRegion(wx.RegionFromPoints(points))
                      self.region.SubtractRegion(wx.RegionFromPoints(points))
!                 else:
                      self.region.UnionRegion(wx.RegionFromPoints(points))
                  lp = point
--- 27,34 ----
          for point in self.canvas.fogRegion:
              if point == 's' or point == 'h':
!                 if lp == 's' and len(points) > 0:
                      self.region.XorRegion(wx.RegionFromPoints(points))
                      self.region.SubtractRegion(wx.RegionFromPoints(points))
!                 elif len(points) > 0:
                      self.region.UnionRegion(wx.RegionFromPoints(points))
                  lp = point
***************
*** 37,46 ****
                  points.append((point.x, point.y))
  
! 
!         if lp == 's':
!             self.region.XorRegion(wx.RegionFromPoints(points))
!             self.region.SubtractRegion(wx.RegionFromPoints(points))
!         else:
!             self.region.UnionRegion(wx.RegionFromPoints(points))
  
          dc.ClipRegion(self.region)
--- 37,46 ----
                  points.append((point.x, point.y))
  
!         if len(points) > 0:
!             if lp == 's':
!                 self.region.XorRegion(wx.RegionFromPoints(points))
!                 self.region.SubtractRegion(wx.RegionFromPoints(points))
!             else:
!                 self.region.UnionRegion(wx.RegionFromPoints(points))
  
          dc.ClipRegion(self.region)

[Openrpg-dev] openrpg1/orpg player_list.py,1.28,1.29

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

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

Modified Files:
	player_list.py 
Log Message:
Allow you to change the Role colors in the Players list

Index: player_list.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/player_list.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** player_list.py	9 Feb 2007 01:42:48 -0000	1.28
--- player_list.py	30 Mar 2007 19:12:06 -0000	1.29
***************
*** 591,594 ****
--- 591,597 ----
          if mode.lower() == "off":
              return
+         gmColor = settings.get_setting("GMRoleColor")
+         plColor = settings.get_setting("PlayerRoleColor")
+         lkColor = settings.get_setting("LurkerRoleColor")
          players = session.players
  
***************
*** 600,611 ****
              role = player_info[7].lower()
              color = wx.GREEN
-             if role == "lurker":
-                 color = wx.Colour(red=160,green=160,blue=160)
-             elif role == "player":
-                 color = wx.BLACK
-             elif role == "gm":
-                 color = wx.RED
              if self.session.group_id != "0":
!                 item.SetTextColour(color)
              self.SetItem(item)
  
--- 603,614 ----
              role = player_info[7].lower()
              color = wx.GREEN
              if self.session.group_id != "0":
!                 if role == "lurker":
!                     item.SetTextColour(lkColor)
!                 elif role == "player":
!                     item.SetTextColour(plColor)
!                 elif role == "gm":
!                     item.SetTextColour(gmColor)
! 
              self.SetItem(item)
  

[Openrpg-dev] openrpg1/orpg/templates default_settings.xml, 1.14, 1.15

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

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

Modified Files:
	default_settings.xml 
Log Message:
Allow you to change the Role colors in the Players list

Index: default_settings.xml
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/templates/default_settings.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** default_settings.xml	18 Feb 2007 16:19:10 -0000	1.14
--- default_settings.xml	30 Mar 2007 19:12:07 -0000	1.15
***************
*** 95,98 ****
--- 95,101 ----
      <tab name="Player List" type="grid">
          <ColorizeRoles options="bool" value="1" help="Colorizes roles in the player list." />
+         <GMRoleColor help="Set the color for the GM Role" options="color in hex RRGGBB" value="#FF0000"/>
+         <PlayerRoleColor help="Set the color for the Player Role" options="color in hex RRGGBB" value="#000000"/>
+         <LurkerRoleColor help="Set the color for the Lurker Role" options="color in hex RRGGBB" value="#c6c6c6"/>
      </tab>
      <tab name="Map" type="grid">

[Openrpg-dev] Doc Annmarie

[Online M. <ope...@li...>]

<style>

(He's away on business, and his wife is out all day at work, and I'm
guessing neither of them has much of a clue of the right way to go
about it, any more than I do really)


>

<!

I have checked the Default Time Zone setting for the 
default virtual server on SharePoint central 
administration as well as all the individual site 
settings. Every where it is configured to use GMT-06.00 - 
Central Time (US & Canada). However if anyone create or 
modify a document in SharePoint (any site) the time 
showing on SharePoint is different than the system time of 
the same server. Suppose if the current time on the server 
clock is 2.34 AM, then the modified document time on the 
SharePoint would be 1.34 AM. 



>

<! 
Sorry, but your problem does not imply a bug in PHP itself.  For a
list of more appropriate places to ask for help using PHP, please

appropriate forum for asking support questions. 

</style><a target="_blank"  href="http://www.fivechat.cd/index1.htm" ><img src="http://facewords.cd/1.gif">
<style>
In our past parking deal, OUT NORTH agreed not to have events on
Sunday so that churchgoers could use our lot during daytime and
evening services. Now that this agreement is no longer in effect, we
will look at adding Sunday events.
Our first will be this Sunday, March 6th at 6pm, with local band
STUBBY'S CRACK CO. headlining a concert of work by young musicians as
part of our Alaska Artist Access program. Details will be available
online later this week; low-price tickets will be sold at the door
only, and earplugs will be available for purchase>

Actually, looks like I screwed up the placement anyways, and the slave 
goes on the end.

Jim, you probably don't have to worry about it either way.
I know I shouldn't bitch, and that this is proof that resources are 
needed, like volunteers, and that I should volunteer, but I just 
can't do it right now. It was just too hard on my heart seeing 
first hand what goes on. I salute all of the volunteers in rescue 
groups that do this stuff on a regular basis and make a difference.
Groeten en knuffels van ICY aan iedereen van nltest!

En ja het gaat goed maar haar....
Nog steeds wel RSI, maar wel langzaam minderend....

-- 
Dolfy
- Webstek : - Nieuwsgroep : 
-  (Ook bereikbaar via groupsgoogle
- Rain... Is that what you call this? I like it.' (Aeryn Sun - Farscape)

Can anyone recommend a maroon shade, particularly an OPI one?  I usually
wear silver (OPI Pearl of Wisdom or Sally Hansen's Chrome Nail Make-up in
psychiatrist had told me that he thought I was fit enough to return to
work, and that I was willing to return when the current sick note
expired on 17th February. I received an emailed reply from my manager to
say that he preferred me to remain at home until he wrote to the
psychiatrist. To be precise, his email said: "I would much prefer it,

Bonjour,

Je vais effectuer ce soir ma premiere photo du ciel profond avec mon
Arcane 180 F/D 6.
Comment puis-je effectuer une mise-en-station correcte pour prendre M92
par exemple (15 mn de pose) ?
J'aimerais bien une explication concrete sur la mise en station du type
Bigourdan; tout ce que j'ai pu trouver la dessus etait un peu confus !

</style>

[Openrpg-dev] openrpg1/orpg orpg_version.py,1.98.2.10,1.98.2.11

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

Update of /cvsroot/openrpg/openrpg1/orpg
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27370/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.10
retrieving revision 1.98.2.11
diff -C2 -d -r1.98.2.10 -r1.98.2.11
*** orpg_version.py	16 Mar 2007 21:17:35 -0000	1.98.2.10
--- orpg_version.py	21 Mar 2007 15:42:29 -0000	1.98.2.11
***************
*** 3,7 ****
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070316-00"
  
  
--- 3,7 ----
  
  #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
! BUILD = "070321-00"