home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e21354
)
New client: Improve code readability.
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 22 Nov 2015 22:27:46 +0000
(23:27 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 22 Nov 2015 22:27:46 +0000
(23:27 +0100)
client_prototype.py
patch
|
blob
|
history
diff --git
a/client_prototype.py
b/client_prototype.py
index 5e9f16809c4556ee986bf708ae82091ada58a068..8201a75db31b3898dede5e3df87a71769ef776fb 100644
(file)
--- a/
client_prototype.py
+++ b/
client_prototype.py
@@
-121,10
+121,11
@@
def draw_screen():
stop = [0, 0]
for i in range(2):
stop[i] = win["size"][i] + offset[i]
stop = [0, 0]
for i in range(2):
stop[i] = win["size"][i] + offset[i]
- stop[i] = stop[i] if stop[i] < size[i] else size[i]
+ if stop[i] >= winmap_size[i]:
+ stop[i] = winmap_size[i]
for y in range(offset[0], stop[0]):
for x in range(offset[1], stop[1]):
for y in range(offset[0], stop[0]):
for x in range(offset[1], stop[1]):
- cell = winmap[y * size[1] + x]
+ cell = winmap[y *
winmap_
size[1] + x]
y_in_screen = win["start"][0] + (y - offset[0])
x_in_screen = win["start"][1] + (x - offset[1])
if (y_in_screen < screen_size[0]
y_in_screen = win["start"][0] + (y - offset[0])
x_in_screen = win["start"][1] + (x - offset[1])
if (y_in_screen < screen_size[0]
@@
-152,12
+153,13
@@
def draw_screen():
pos_1 = win["start"][i]
draw_scroll_arrows('^', '<')
draw_scroll_string(offset[i])
pos_1 = win["start"][i]
draw_scroll_arrows('^', '<')
draw_scroll_string(offset[i])
- if (size[i] > offset[i] + win["size"][i]):
+ if (
winmap_
size[i] > offset[i] + win["size"][i]):
pos_1 = win["start"][i] + win["size"][i] - 1
draw_scroll_arrows('v', '>')
pos_1 = win["start"][i] + win["size"][i] - 1
draw_scroll_arrows('v', '>')
- draw_scroll_string(size[i] - offset[i] - win["size"][i])
+ draw_scroll_string(winmap_size[i] - offset[i]
+ - win["size"][i])
for win in windows:
for win in windows:
- offset, size, winmap = win["func"]()
+ offset,
winmap_
size, winmap = win["func"]()
draw_winmap()
draw_scroll_hints()
draw_winmap()
draw_scroll_hints()
@@
-258,18
+260,18
@@
def cursed_main(stdscr):
def win_foo():
winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
def win_foo():
winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
- size = [4, 3]
+
winmap_
size = [4, 3]
offset = [0, 0]
offset = [0, 0]
- return offset, size, winmap
+ return offset,
winmap_
size, winmap
def win_info():
winmap = "T: " + str(world_data["turn"]) \
+ " H: " + str(world_data["lifepoints"]) \
+ " S: " + str(world_data["satiation"])
def win_info():
winmap = "T: " + str(world_data["turn"]) \
+ " H: " + str(world_data["lifepoints"]) \
+ " S: " + str(world_data["satiation"])
- size = [1, len(winmap)]
+
winmap_
size = [1, len(winmap)]
offset = [0, 0]
offset = [0, 0]
- return offset, size, winmap
+ return offset,
winmap_
size, winmap
def win_log():
def win_log():