--- a/orpg/mapper/map.py	Mon Apr 26 16:15:50 2010 -0500
+++ b/orpg/mapper/map.py	Tue Apr 27 00:58:29 2010 -0500
@@ -250,8 +250,9 @@
         topleft1 = self.GetViewStart()
         topleft = [topleft1[0]*scrollsize[0], topleft1[1]*scrollsize[1]]
         if (clientsize[0] > 1) and (clientsize[1] > 1):
-            self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
-            dc = wx.AutoBufferedPaintDC(self)
+            dc = wx.MemoryDC()
+            bmp = wx.EmptyBitmap(clientsize[0]+1, clientsize[1]+1)
+            dc.SelectObject(bmp)
             dc.SetPen(wx.TRANSPARENT_PEN)
             dc.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID))
             dc.DrawRectangle(0,0,clientsize[0]+1,clientsize[1]+1)
@@ -266,11 +267,22 @@
             self.layers['fog'].layerDraw(dc, topleft, clientsize)
             dc.SetPen(wx.NullPen)
             dc.SetBrush(wx.NullBrush)
+
+            dc.SelectObject(wx.NullBitmap)
+            del dc
+            wdc = self.preppaint()
+            wdc.DrawBitmap(bmp, topleft[0], topleft[1])
+
             if settings.get_setting("AlwaysShowMapScale") == "1":
-                self.showmapscale(dc)
+                self.showmapscale(wdc)
         try: evt.Skip()
         except: pass
 
+    def preppaint(self):
+        dc = wx.PaintDC(self)
+        self.PrepareDC(dc)
+        return (dc)
+
     def showmapscale(self, dc):
         scalestring = "Scale x" + `self.layers['grid'].mapscale`[:3]
         (textWidth, textHeight) = dc.GetTextExtent(scalestring)

--- a/orpg/mapper/whiteboard_handler.py	Mon Apr 26 16:15:50 2010 -0500
+++ b/orpg/mapper/whiteboard_handler.py	Tue Apr 27 00:58:29 2010 -0500
@@ -754,9 +754,9 @@
         pos = self.get_snapped_to_logical_pos(evt)
         size = self.canvas.layers['grid'].unit_size #60
         radius = int(int(self.radius.GetValue())/5)
-        center = wx.Point(pos.x, pos.y+size*radius)
+        center = wx.Point(pos.x, pos.y)
         curve  = self.calculate_circle(center, radius, size)
-        if(self.temp_circle):
+        if self.temp_circle:
             self.canvas.layers['whiteboard'].del_temp_line(self.temp_circle)
             self.selected = None
         self.temp_circle = self.canvas.layers['whiteboard'].add_temp_line(curve)

--- a/orpg/orpg_version.py	Mon Apr 26 16:15:50 2010 -0500
+++ b/orpg/orpg_version.py	Tue Apr 27 00:58:29 2010 -0500
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Alpha"
 DIS_VER = "Ornery Orc"
-BUILD = "100426-01"
+BUILD = "100427-00"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"

--- a/orpg/tools/InterParse.py	Mon Apr 26 16:15:50 2010 -0500
+++ b/orpg/tools/InterParse.py	Tue Apr 27 00:58:29 2010 -0500
@@ -38,8 +38,8 @@
     def __init__(self):
         pass
 
-    def Post(self, s, tab=True, send=False, myself=False):
-        if tab: tab = component.get('chat')
+    def Post(self, s, tab=False, send=False, myself=False):
+        if not tab: tab = component.get('chat')
         s = self.Normalize(s, tab)
         tab.set_colors()
         tab.Post(s, send, myself)

--- a/plugins/xxurl2link.py	Mon Apr 26 16:15:50 2010 -0500
+++ b/plugins/xxurl2link.py	Tue Apr 27 00:58:29 2010 -0500
@@ -9,15 +9,11 @@
     def __init__(self, plugindb, parent):
         orpg.pluginhandler.PluginHandler.__init__(self, plugindb, parent)
 
-        # The Following code should be edited to contain the proper information
         self.name = 'URL to link conversion'
         self.author = 'tdb30 tbaleno@wrathof.com'
         self.help = "This plugin automaticaly wraps urls in link tags\n"
         self.help += "making them clickable."
 
-        self.url_regex = None
-        self.mailto_regex = None
-
     def plugin_menu(self):
         self.menu = wx.Menu()
         self.toggle = self.menu.AppendCheckItem(wx.ID_ANY, 'On')
@@ -29,17 +25,12 @@
         pass
 
     def plugin_enabled(self):
-        #This is where you set any variables that need to be initalized when your plugin starts
-        self.url_regex = re.compile("(?<![\[=\"a-z0-9:/.])((?:http|ftp|gopher)://)?(?<![@a-z])((?:[a-z0-9\-]+[-.]?[a-z0-9]+)*\.(?:[a-z]{2,4})(?:[a-z0-9_=\?\#\&~\%\.\-/\:\+;]*))", re.I)
-
-        self.mailto_regex = re.compile("(?<![=\"a-z0-9:/.])((?:[a-z0-9]+[_]?[a-z0-9]*)+@{1}(?:[a-z0-9]+[-.]?[a-z0-9]+)*\.(?:[a-z]{2,4}))", re.I)
-
+        self.url_regex = re.compile("((?:http|ftp|gopher)://(.*?).\com)", re.I)
+        self.mailto_regex = re.compile("(.*?(@).*?(.\com))", re.I)
         self.link = self.plugindb.GetString('xxurl2link', 'url2link', '') or 'False'
         self.toggle.Check(True) if self.link == 'True' else self.toggle.Check(False)
 
     def plugin_disabled(self):
-        #Here you need to remove any commands you added, and anything else you want to happen when you disable the plugin
-        #such as closing windows created by the plugin
         pass
 
     def pre_parse(self, text):
@@ -60,7 +51,5 @@
 
     def regurlsub(self, m):
         link = m.group(2)
-        if m.group(1) != None:
-            return '<a href="' + m.group(1).lower() + link + '">' + m.group(0) + '</a>'
-        else:
-            return '<a href="http://' + link + '">' + link + '</a>'
+        if m.group(1) != None: return '<a href="' + m.group(1).lower() + '">' + m.group(0) + '</a>'
+        else: return '<a href="http://' + link + '">' + link + '</a>'