X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=7d4532108afdd14d76a513dc45603085b018e4de;hb=0e8f9d67473a7fc8a9784abfb111e9dd95a2d742;hp=140da879b96e2098a21c400ac8f3ea56ba886ecd;hpb=29eef685c73aa4a9e555b05b838ea6776abb8ce5;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 140da87..7d45321 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -294,20 +294,19 @@ def try_worldstate_update():
         length = world_db["MAP_LENGTH"]
         fov = bytearray(b' ' * (length ** 2))
         for pos in range(length ** 2):
-            fovflag = world_db["Things"][0]["fovmap"][pos]
-            if 'v' == chr(fovflag):
+            if 'v' == chr(world_db["Things"][0]["fovmap"][pos]):
                 fov[pos] = world_db["MAP"][pos]
         for i in range(3):
             draw_visible_Things(fov, i)
         string = write_map(string, fov)
         mem = world_db["Things"][0]["T_MEMMAP"][:]
         for i in range(2):
-            for id in world_db["Things"][0]["T_MEMTHING"]:
-                type = world_db["Things"][id]["T_TYPE"]
+            for memthing in world_db["Things"][0]["T_MEMTHING"]:
+                type = world_db["Things"][memthing[0]]["T_TYPE"]
                 consumable = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
                 if (i == 0 and not consumable) or (i == 1 and consumable):
-                        c = world_db["ThingTypes"][type]["TT_SYMBOL"]
-                        mem[(y * length) + x] = ord(c)
+                    c = world_db["ThingTypes"][type]["TT_SYMBOL"]
+                    mem[(memthing[1] * length) + memthing[2]] = ord(c)
         string = write_map(string, mem)
         atomic_write(io_db["path_worldstate"], string)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
@@ -383,18 +382,18 @@ def update_map_memory(t):
                 t["T_MEMMAP"][pos] = world_db["MAP"][pos]
             continue
         # TODO: Aging of MEMDEPTHMAP.
-    for id in t["T_MEMTHING"]:
-        y = world_db["Things"][id]["T_POSY"]
-        x = world_db["Things"][id]["T_POSY"]
+    for memthing in t["T_MEMTHING"]:
+        y = world_db["Things"][memthing[0]]["T_POSY"]
+        x = world_db["Things"][memthing[1]]["T_POSY"]
         if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
-            t["T_MEMTHING"].remove(id)
+            t["T_MEMTHING"].remove(memthing)
     for id in world_db["Things"]:
         type = world_db["Things"][id]["T_TYPE"]
         if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
             y = world_db["Things"][id]["T_POSY"]
             x = world_db["Things"][id]["T_POSY"]
             if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
-                t["T_MEMTHING"] = (type, y, x)
+                t["T_MEMTHING"].append((type, y, x))
 
 
 def set_world_inactive():
@@ -949,7 +948,6 @@ io_db = {
 try:
     opts = parse_command_line_arguments()
     setup_server_io()
-    # print("DUMMY: Run game.")
     if None != opts.replay:
         replay_game()
     else:
@@ -961,4 +959,3 @@ except:
     raise
 finally:
     cleanup_server_io()
-    # print("DUMMY: (Clean up C heap.)")