Further server optimization by outsourcing to libplomrogue.

diff --git a/roguelike-server b/roguelike-server
index ce44fa2da969c375e77440e34e0f5d66b5146a91..d452efbee6ec250036dd93e2af50077b48f9270a 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -39,6 +39,12 @@ def prep_library():
     return libpr
 
 
     return libpr
 
 

+def c_pointer_to_bytearray(ba):
+    """Return C char * pointer to ba."""
+    type = ctypes.c_char * len(ba)
+    return type.from_buffer(ba)
+
+

 def strong_write(file, string):
     """Apply write(string), then flush()."""
     file.write(string)
 def strong_write(file, string):
     """Apply write(string), then flush()."""
     file.write(string)


@@ -824,6 +830,17 @@ def get_dir_to_target(t, filter):
                     return True
         return False
 
                     return True
         return False
 

+    def set_cells_passable_on_memmap_to_65534_on_scoremap():
+        # OUTSOURCED TO libplomrogue.so:
+        # memmap = t["T_MEMMAP"]
+        # for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
+        #            if ord_dot == memmap[i]]:
+        #     set_map_score(i, 65534) # i.e. 65535-1
+        map = c_pointer_to_bytearray(t["T_MEMMAP"])
+        if libpr.set_cells_passable_on_memmap_to_65534_on_scoremap(map):
+            raise RuntimeError("No score map allocated for "
+                         "set_cells_passable_on_memmap_to_65534_on_scoremap().")
+

     def init_score_map():
         test = libpr.init_score_map()
         if test:
     def init_score_map():
         test = libpr.init_score_map()
         if test:


@@ -831,9 +848,7 @@ def get_dir_to_target(t, filter):
         ord_dot = ord(".")
         ord_v = ord("v")
         ord_blank = ord(" ")
         ord_dot = ord(".")
         ord_v = ord("v")
         ord_blank = ord(" ")

-        for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
-                  if ord_dot == t["T_MEMMAP"][i]]:
-            set_map_score(i, 65535 - 1)
+        set_cells_passable_on_memmap_to_65534_on_scoremap()

         if "a" == filter:
             for id in world_db["Things"]:
                 Thing = world_db["Things"][id]
         if "a" == filter:
             for id in world_db["Things"]:
                 Thing = world_db["Things"][id]

diff --git a/src/server/libplomrogue.c b/src/server/libplomrogue.c
index 0e8f3fb54a74fcad65020257f661a10289a55f46..7cd76d9c80e2d80314a7371280febb6410de0835 100644 (file)
--- a/src/server/libplomrogue.c
+++ b/src/server/libplomrogue.c
@@ -599,3 +599,21 @@ extern void age_some_memdepthmap_on_nonfov_cells(char * memdepthmap,
         }
     }
 }
         }
     }
 }

+
+extern uint8_t set_cells_passable_on_memmap_to_65534_on_scoremap(char * mem_map)
+{
+    if (!score_map)
+    {
+        return 1;
+    }
+    uint32_t map_size = maplength * maplength;
+    uint16_t pos;
+    for (pos = 0; pos < map_size; pos++)
+    {
+        if ('.' == mem_map[pos])
+        {
+            score_map[pos] = 65534;
+        }
+    }
+    return 0;
+}