Fix screen jumping around.

[plomrogue2-experiments] / new2 / rogue_chat_curses.py

diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py
index e272fb2efb2cc53ef5796d8fa2064ee268565518..ad6f4f98e349bd5eb6e7b006e0b852c2ee7913fc 100755 (executable)
--- a/new2/rogue_chat_curses.py
+++ b/new2/rogue_chat_curses.py
@@ -10,8 +10,6 @@ from plomrogue.mapping import YX
 from plomrogue.things import ThingBase
 from plomrogue.misc import quote
 
-# TODO: fix screen refreshes on intermediary map results
-
 def cmd_TURN(game, n):
     game.turn = n
     game.things = []
@@ -240,6 +238,10 @@ class TUI:
             stdscr.addstr(1, self.window_width, 'MODE: ' + self.mode.name)
 
         def draw_map():
+            player = self.game.get_thing(self.game.player_id, False)
+            if not player:
+                # catches race conditions where game.things still empty
+                return
             map_lines_split = []
             for y in range(self.game.map_size.y):
                 start = self.game.map_size.x * y
@@ -256,13 +258,9 @@ class TUI:
                             int(self.game.map_size.x / 2))
             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))
-            center = map_center
+            center = player
             if self.mode.shows_info:
                 center = self.explorer
-            else:
-                player = self.game.get_thing(self.game.player_id, False)
-                if player:
-                    center = player.position
             offset = center - window_center
             term_y = max(0, -offset.y)
             term_x = max(0, -offset.x)