X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=server%2Factions.py;h=4dc470b69d068ad5173946ae9ec2d62eb114dc53;hb=5cdce6d500080008b097435e2891674c16fde208;hp=7222ad871cea7c0f3153cf8a61833dff6691d02d;hpb=2fe74dcee473121f423cd37e4b1da5bb0139146e;p=plomrogue
diff --git a/server/actions.py b/server/actions.py
index 7222ad8..4dc470b 100644
--- a/server/actions.py
+++ b/server/actions.py
@@ -55,9 +55,11 @@ def actor_move(t):
if passable:
t["T_POSY"] = move_result[1]
t["T_POSX"] = move_result[2]
+ t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
for id in t["T_CARRIES"]:
world_db["Things"][id]["T_POSY"] = move_result[1]
world_db["Things"][id]["T_POSX"] = move_result[2]
+ world_db["Things"][id]["pos"] = t["pos"]
build_fov_map(t)
if t == world_db["Things"][0]:
log("You MOVE " + dir + ".")
@@ -71,8 +73,7 @@ def actor_pickup(t):
"""
ids = [id for id in world_db["Things"] if world_db["Things"][id] != t
if not world_db["Things"][id]["carried"]
- if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
- if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
+ if world_db["Things"][id]["pos"] == t["pos"]]
if len(ids):
lowest_tid = -1
for iid in ids: