--- src/empParse.py	Tue Jan 13 17:56:52 2004
+++ src/empParse.py	Wed Jan 14 21:15:39 2004
@@ -142,7 +142,7 @@
     DB = empDb.megaDB['SECTOR']
     changes = []
     for col, row, t in lst:
-        if t not in ' ?X' and not empDb.megaDB['sectortype'].has_key(t):
+        if t not in ' ?XABCDEFGHIJKLMNOPQRSTUVWYZ' and not empDb.megaDB['sectortype'].has_key(t):
             # Exclusion of all sector designations that aren't actual
             # designations.  Still buggy as it doesn't handle bmaps. 
             continue
@@ -150,7 +150,7 @@
         oldown = ldict.get('owner')
         olddes = ldict.get('des')
         ndict = {}
-        if t == 'X' and mapType != 'bmap':
+        if t in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' and mapType != 'bmap':
             continue
         if t == 'X' and mapType == 'bmap' and olddes == '.':
             ndict['des'] = t
@@ -163,8 +163,8 @@
             # bmap
             if t == ' ':
                 continue
-            if t == '?':
-                if not olddes or (mapType == 'bmap' and olddes == '-'):
+            if t in '?ABCDEFGHIJKLMNOPQRSTUVWXYZ':
+                if not olddes or (mapType == 'bmap' and olddes in '-?ABCDEFGHIJKLMNOPQRSTUVWYZ'):
                     ndict['des'] = t
             elif not olddes or oldown != CN_OWNED:
                 ndict['des'] = t
--- src/MapWin.py	Wed Jan 14 20:46:20 2004
+++ src/MapWin.py	Tue Jan 20 20:04:21 2004
@@ -298,18 +298,71 @@
                 if oldown is not None and oldown != own:
                     oldownName="oldownerEnemy"
             elif own is not None and (own == CN_ENEMY or own > 0):
-                hexName = "enemySector"
-                if oldown is not None and oldown != own:
+                if own != CN_UNOWNED:
+                    hexName = "sharebmap%dSector" % own
+                else:
+                    hexName = "enemySector"
+                    if oldown is not None and oldown != own:
                         if oldown == CN_OWNED:
                                 oldownName="oldownerMyself"
                         else:
                                 oldownName="oldownerUnknown"
-            elif own == CN_UNOWNED:
+            elif own == CN_UNOWNED and des not in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
                 hexName = "unownedSector"
             elif des in ".\\":
                 hexName = "seaSector"
             elif des == 'X':
                 hexName = "mineSector"
+            elif des == 'A':
+                hexName = "sharebmapaSector"
+            elif des == 'B':
+                hexName = "sharebmapbSector"
+            elif des == 'C':
+                hexName = "sharebmapcSector"
+            elif des == 'D':
+                hexName = "sharebmapdSector"
+            elif des == 'E':
+                hexName = "sharebmapeSector"
+            elif des == 'F':
+                hexName = "sharebmapfSector"
+            elif des == 'G':
+                hexName = "sharebmapgSector"
+            elif des == 'H':
+                hexName = "sharebmaphSector"
+            elif des == 'I':
+                hexName = "sharebmapiSector"
+            elif des == 'J':
+                hexName = "sharebmapjSector"
+            elif des == 'K':
+                hexName = "sharebmapkSector"
+            elif des == 'L':
+                hexName = "sharebmaplSector"
+            elif des == 'M':
+                hexName = "sharebmapmSector"
+            elif des == 'N':
+                hexName = "sharebmapnSector"
+            elif des == 'O':
+                hexName = "sharebmapoSector"
+            elif des == 'P':
+                hexName = "sharebmappSector"
+            elif des == 'Q':
+                hexName = "sharebmapqSector"
+            elif des == 'R':
+                hexName = "sharebmaprSector"
+            elif des == 'S':
+                hexName = "sharebmapsSector"
+            elif des == 'T':
+                hexName = "sharebmaptSector"
+            elif des == 'U':
+                hexName = "sharebmapuSector"
+            elif des == 'V':
+                hexName = "sharebmapvSector"
+            elif des == 'W':
+                hexName = "sharebmapwSector"
+            elif des == 'Y':
+                hexName = "sharebmapySector"
+            elif des == 'Z':
+                hexName = "sharebmapzSector"
             else:
                 hexName = "unknownSector"