From 37b5ba162c928081e19c865912a9b7b7d091c27c Mon Sep 17 00:00:00 2001 From: Joscha Date: Fri, 7 Apr 2017 19:39:45 +0000 Subject: [PATCH] Ignore normal input besides scrolling when ChunkMap is displayed --- client.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/client.py b/client.py index 5c23ca7..15b99f4 100644 --- a/client.py +++ b/client.py @@ -61,21 +61,25 @@ class Client(): self.chunkmap_active = not self.chunkmap_active self.drawevent.set() elif i == "KEY_F(5)": self.map_.redraw() - # normal cursor movement - elif i == "KEY_UP": self.map_.move_cursor(0, -1) - elif i == "KEY_DOWN": self.map_.move_cursor(0, 1) - elif i == "KEY_LEFT": self.map_.move_cursor(-1, 0) - elif i == "KEY_RIGHT": self.map_.move_cursor(1, 0) - # quick cursor movement (5 vertical, 10 horizontal) - elif i == "KEY_SR": self.map_.move_cursor(0, -5) - elif i == "KEY_SF": self.map_.move_cursor(0, 5) - elif i == "KEY_SLEFT": self.map_.move_cursor(-10, 0) - elif i == "KEY_SRIGHT": self.map_.move_cursor(10, 0) # scrolling the map (10 vertical, 20 horizontal) elif i == "kUP5": self.map_.scroll(0, -10) elif i == "kDN5": self.map_.scroll(0, 10) elif i == "kLFT5": self.map_.scroll(-20, 0) elif i == "kRIT5": self.map_.scroll(20, 0) + + # break here if chunkmap is shown: Don't allow for cursor movement or input + elif self.chunkmap_active: pass + + # quick cursor movement (5 vertical, 10 horizontal) + elif i == "KEY_SR": self.map_.move_cursor(0, -5) + elif i == "KEY_SF": self.map_.move_cursor(0, 5) + elif i == "KEY_SLEFT": self.map_.move_cursor(-10, 0) + elif i == "KEY_SRIGHT": self.map_.move_cursor(10, 0) + # normal cursor movement + elif i == "KEY_UP": self.map_.move_cursor(0, -1) + elif i == "KEY_DOWN": self.map_.move_cursor(0, 1) + elif i == "KEY_LEFT": self.map_.move_cursor(-1, 0) + elif i == "KEY_RIGHT": self.map_.move_cursor(1, 0) # edit world elif i in string.digits + string.ascii_letters + string.punctuation + " ": self.map_.write(i)