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:
cc55ff5
)
Re-insert map existence check in command_worldactive().
author
Christian Heller
<c.heller@plomlompom.de>
Wed, 11 Mar 2015 13:31:11 +0000
(14:31 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Wed, 11 Mar 2015 13:31:11 +0000
(14:31 +0100)
roguelike-server
patch
|
blob
|
history
diff --git
a/roguelike-server
b/roguelike-server
index b2d53e35337b87826308de324d859db1effc3018..87a4e24267bad8afaca75e91d21cc73712b154ba 100755
(executable)
--- a/
roguelike-server
+++ b/
roguelike-server
@@
-1346,10
+1346,9
@@
def command_worldactive(worldactive_string):
"""Toggle world_db["WORLD_ACTIVE"] if possible.
An active world can always be set inactive. An inactive world can only be
"""Toggle world_db["WORLD_ACTIVE"] if possible.
An active world can always be set inactive. An inactive world can only be
- set active with a "wait" ThingAction, and a player Thing (of ID 0)
. On
- activation, rebuild all Things' FOVs, and the player's map memory.
+ set active with a "wait" ThingAction, and a player Thing (of ID 0)
, and a
+
map. On
activation, rebuild all Things' FOVs, and the player's map memory.
"""
"""
- # In original version, map existence was also tested (unnecessarily?).
val = integer_test(worldactive_string, 0, 1)
if val:
if 0 != world_db["WORLD_ACTIVE"]:
val = integer_test(worldactive_string, 0, 1)
if val:
if 0 != world_db["WORLD_ACTIVE"]:
@@
-1368,7
+1367,7
@@
def command_worldactive(worldactive_string):
if 0 == Thing:
player_exists = True
break
if 0 == Thing:
player_exists = True
break
- if wait_exists and player_exists:
+ if wait_exists and player_exists
and world_db["MAP"]
:
for id in world_db["Things"]:
if world_db["Things"][id]["T_LIFEPOINTS"]:
build_fov_map(world_db["Things"][id])
for id in world_db["Things"]:
if world_db["Things"][id]["T_LIFEPOINTS"]:
build_fov_map(world_db["Things"][id])