From: Christian Heller Date: Fri, 26 Feb 2016 12:44:31 +0000 (+0100) Subject: Server: Refactor command_taname. X-Git-Tag: tce~140 X-Git-Url: https://plomlompom.com/repos/foo.html?a=commitdiff_plain;ds=inline;h=901b83625dc140d710369469e1a8c7dd707a4867;hp=65c57618b95b9111b07f8fbc4c38c99d942a272a;p=plomrogue Server: Refactor command_taname. --- diff --git a/server/commands.py b/server/commands.py index 1ce6464..eb8cf1c 100644 --- a/server/commands.py +++ b/server/commands.py @@ -142,7 +142,6 @@ def command_worldactive(worldactive_string): world_db["WORLD_ACTIVE"] = 1 else: print("Ignoring: No map defined for world to activate.") - return def command_tid(id_string): @@ -316,16 +315,13 @@ def command_taname(name): or name == "pickup": world_db["ThingActions"][command_taid.id]["TA_NAME"] = name if 1 == world_db["WORLD_ACTIVE"]: - wait_defined = False for id in world_db["ThingActions"]: if "wait" == world_db["ThingActions"][id]["TA_NAME"]: - wait_defined = True break - if not wait_defined: + else: set_world_inactive() else: print("Ignoring: Invalid action name.") - # In contrast to the original,naming won't map a function to a ThingAction. def setter(category, key, min, max=None):