X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/static/git-favicon.png?a=blobdiff_plain;f=client_prototype.py;h=a398822241b635c656170b6d91c11504667fd3a8;hb=dfa13933d877a92982f747a69defee4f2d8f1f7e;hp=582df073688bd4a9a7f43314a30ae820cc51768a;hpb=177f9281c875a37b62793771e5b38564faac0e89;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 582df07..a398822 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -86,7 +86,7 @@ def set_window_geometries():
 def draw_screen():
 
     def healthy_addch(y, x, char, attr=0):
-    """Bizarre workaround for <http://stackoverflow.com/questions/7063128/>."""
+        """Workaround for <http://stackoverflow.com/questions/7063128/>."""
         if y == screen_size[0] - 1 and x == screen_size[1] - 1:
             char_before = stdscr.inch(y, x - 1)
             stdscr.addch(y, x - 1, char, attr)
@@ -298,15 +298,27 @@ def win_foo():
 
 
 def win_map():
+    win_size = next(win["size"] for win in windows if win["func"] == win_map)
     offset = [0, 0]
+    for i in range(2):
+        if world_data["position"][i] * (i + 1) > win_size[i] / 2:
+            if world_data["position"][i] * (i + 1) \
+                < world_data["map_size"] * (i + 1) - win_size[i] / 2:
+                offset[i] = world_data["position"][i] * (i + 1) \
+                    - int(win_size[i] / 2)
+            else:
+                offset[i] = world_data["map_size"] * (i + 1) - win_size[i] + i
     winmap_size = [world_data["map_size"], world_data["map_size"] * 2 + 1]
     winmap = []
+    curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLUE)
+    curses.init_pair(2, curses.COLOR_BLUE, curses.COLOR_BLACK)
     for y in range(world_data["map_size"]):
         for x in range(world_data["map_size"]):
             char = world_data["fov_map"][y * world_data["map_size"] + x]
             if char == " ":
                 char = world_data["mem_map"][y * world_data["map_size"] + x]
-                attribute = curses.A_REVERSE
+                attribute = curses.color_pair(1) if char == " " \
+                    else curses.color_pair(2)
                 winmap += [(char, attribute), (" ", attribute)]
             else:
                 winmap += char + " "