home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In actor_move(), don't test target cell passability earlier than needed.
[plomrogue]
/
roguelike-server
diff --git
a/roguelike-server
b/roguelike-server
index 40bfcb84a6fbad44a1642f51b73cac02c7fa708f..53cd75148ff46a43b01d4f7a1a0fa3e2fba34214 100755
(executable)
--- a/
roguelike-server
+++ b/
roguelike-server
@@
-741,9
+741,6
@@
def actor_move(t):
t["T_POSY"], t["T_POSX"])
if 1 == move_result[0]:
pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
t["T_POSY"], t["T_POSX"])
if 1 == move_result[0]:
pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
- passable = ("." == chr(world_db["MAP"][pos]) or
- ":" == chr(world_db["MAP"][pos]) or # #
- "_" == chr(world_db["MAP"][pos])) # #
hitted = [id for id in world_db["Things"]
if world_db["Things"][id] != t
if world_db["Things"][id]["T_LIFEPOINTS"]
hitted = [id for id in world_db["Things"]
if world_db["Things"][id] != t
if world_db["Things"][id]["T_LIFEPOINTS"]
@@
-765,6
+762,9
@@
def actor_move(t):
if test and t == world_db["Things"][0]: # #
add_gods_favor(-test) # #
return
if test and t == world_db["Things"][0]: # #
add_gods_favor(-test) # #
return
+ passable = ("." == chr(world_db["MAP"][pos]) or
+ ":" == chr(world_db["MAP"][pos]) or # #
+ "_" == chr(world_db["MAP"][pos])) # #
dir = [dir for dir in directions_db
if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
if passable:
dir = [dir for dir in directions_db
if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
if passable: