Server: Optimize thing position calculation.

[plomrogue] / server / decrement_lifepoints.py

diff --git a/server/decrement_lifepoints.py b/server/decrement_lifepoints.py
index 8fe5de8c9cbad60146c385df7ca8354456ec3418..d3043deb273e3e5b084ec533a102231397f26160 100644 (file)
--- a/server/decrement_lifepoints.py
+++ b/server/decrement_lifepoints.py
@@ -4,21 +4,20 @@
 
 
 def decrement_lifepoints(t):
-    """Decrement t's lifepoints by 1, and if to zero, corpse it.
+    """Decrement t's lifepoints by 1; if to zero, corpse it, drop its stuff.
 
     If t is the player avatar, only blank its fovmap, so that the client may
     still display memory data. On non-player things, erase fovmap and memory.
-    Dying actors drop all their things.
+    On kill, return dying type's TT_LIFEPOINTS, else 0.
     """
     from server.config.world_data import world_db
     from server.io import log
     t["T_LIFEPOINTS"] -= 1
     if 0 == t["T_LIFEPOINTS"]:
-        for id in t["T_CARRIES"]:
-            t["T_CARRIES"].remove(id)
-            world_db["Things"][id]["T_POSY"] = t["T_POSY"]
-            world_db["Things"][id]["T_POSX"] = t["T_POSX"]
-            world_db["Things"][id]["carried"] = False
+        live_tid = t["T_TYPE"]
+        for tid in t["T_CARRIES"]:
+            t["T_CARRIES"].remove(tid)
+            world_db["Things"][tid]["carried"] = False
         t["T_TYPE"] = world_db["ThingTypes"][t["T_TYPE"]]["TT_CORPSE_ID"]
         if world_db["Things"][0] == t:
             t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
@@ -29,3 +28,5 @@ def decrement_lifepoints(t):
             t["T_MEMMAP"] = False
             t["T_MEMDEPTHMAP"] = False
             t["T_MEMTHING"] = []
+        return world_db["ThingTypes"][live_tid]["TT_LIFEPOINTS"]
+    return 0