Server/py: Remove uncommented code.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 05975528d6e66b0c34de55734e7d2e11b9572955..0c171d92a193ac5962c930467a44a6a8ed42c492 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -39,6 +39,9 @@ def prep_library():
     libpr.result_y.restype = ctypes.c_uint8
     libpr.result_x.restype = ctypes.c_uint8
     libpr.set_maplength(world_db["MAP_LENGTH"])
+    libpr.build_fov_map.argtypes = [ctypes.c_uint8, ctypes.c_uint8,
+                                    ctypes.c_char_p, ctypes.c_char_p]
+    libpr.build_fov_map.restype = ctypes.c_uint8
     return libpr
 
 
@@ -269,7 +272,7 @@ def read_command():
     Keep building return string until a newline is encountered. Pause between
     unsuccessful reads, and after too much waiting, run server_test().
     """
-    wait_on_fail = 1
+    wait_on_fail = 0.03333
     max_wait = 5
     now = time.time()
     command = ""
@@ -537,7 +540,12 @@ def setter(category, key, min, max):
 def build_fov_map(t):
     """Build Thing's FOV map."""
     t["fovmap"] = bytearray(b'v' * (world_db["MAP_LENGTH"] ** 2))
-    # DUMMY so far. Just builds an all-visible map.
+    maptype = ctypes.c_char * len(world_db["MAP"])
+    test = libpr.build_fov_map(t["T_POSY"], t["T_POSX"],
+                               maptype.from_buffer(t["fovmap"]),
+                               maptype.from_buffer(world_db["MAP"]))
+    if test:
+        raise SystemExit("Malloc error in build_fov_Map().")
 
 
 def decrement_lifepoints(t):
@@ -560,6 +568,15 @@ def decrement_lifepoints(t):
             strong_write(io_db["file_out"], "LOG It dies.\n")
 
 
+def mv_yx_in_dir_legal(dir, y, x):
+    """Wrapper around libpr.mv_yx_in_dir_legal to simplify its use."""
+    dir_c = dir.encode("ascii")[0]
+    test = libpr.mv_yx_in_dir_legal_wrap(dir_c, y, x)
+    if -1 == test:
+        raise SystemExit("Too much wrapping in mv_yx_in_dir_legal_wrap()!")
+    return (test, libpr.result_y(), libpr.result_x())
+
+
 def actor_wait(t):
     """Make t do nothing (but loudly, if player avatar)."""
     if t == world_db["Things"][0]:
@@ -568,39 +585,36 @@ def actor_wait(t):
 
 def actor_move(t):
     """If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
-    dir_c = t["T_ARGUMENT"].encode("ascii")[0]
-    legal_move = libpr.mv_yx_in_dir_legal_wrap(dir_c, t["T_POSY"], t["T_POSX"])
     passable = False
-    if -1 == legal_move:
-        raise SystemExit("Too much wrapping in mv_yx_in_dir_legal_wrap()!")
-    elif 1 == legal_move:
-        pos = (libpr.result_y() * world_db["MAP_LENGTH"]) + libpr.result_x()
+    move_result = mv_yx_in_dir_legal(t["T_ARGUMENT"], 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])
         hitted = [id for id in world_db["Things"]
                   if world_db["Things"][id] != t
                   if world_db["Things"][id]["T_LIFEPOINTS"]
-                  if world_db["Things"][id]["T_POSY"] == libpr.result_y()
-                  if world_db["Things"][id]["T_POSX"] == libpr.result_x()]
+                  if world_db["Things"][id]["T_POSY"] == move_result[1]
+                  if world_db["Things"][id]["T_POSX"] == move_result[2]]
         if len(hitted):
-            hitted = hitted[0]
-            decrement_lifepoints(world_db["Things"][hitted])
+            hit_id = hitted[0]
             hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
             hitter = "You" if t == world_db["Things"][0] else hitter_name
-            hitted_type = world_db["Things"][hitted]["T_TYPE"]
+            hitted_type = world_db["Things"][hit_id]["T_TYPE"]
             hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]
-            hitted = "you" if hitted == world_db["Things"][0] else hitted_name
+            hitted = "you" if hit_id == 0 else hitted_name
             verb = " wound " if hitter == "You" else " wounds "
             strong_write(io_db["file_out"], "LOG " + hitter + verb + hitted + \
                                             ".\n")
+            decrement_lifepoints(world_db["Things"][hit_id])
             return
     dir = [dir for dir in directions_db
            if directions_db[dir] == t["T_ARGUMENT"]][0]
     if passable:
-        t["T_POSY"] = libpr.result_y()
-        t["T_POSX"] = libpr.result_x()
+        t["T_POSY"] = move_result[1]
+        t["T_POSX"] = move_result[2]
         for id in t["T_CARRIES"]:
-            world_db["Things"][id]["T_POSY"] = libpr.result_y()
-            world_db["Things"][id]["T_POSX"] = libpr.result_x()
+            world_db["Things"][id]["T_POSY"] = move_result[1]
+            world_db["Things"][id]["T_POSX"] = move_result[2]
         build_fov_map(t)
         strong_write(io_db["file_out"], "LOG You move " + dir + ".\n")
     else: