Add client plugin infrastructure.

diff --git a/roguelike-client b/roguelike-client
index 629d4dc4e448243b0842720c0d8de67af09110b7..e0f8558789290a0f889eeeb0c520c623e8261e48 100755 (executable)
--- a/roguelike-client
+++ b/roguelike-client
@@ -89,6 +89,13 @@ def read_message_queue():
             redraw_windows = True
         elif message == "WORLD_UPDATED":
             query_mapcell()
             redraw_windows = True
         elif message == "WORLD_UPDATED":
             query_mapcell()

+        elif message == "PLUGIN":
+            str_plugin = message[7:]
+            if (str_plugin.replace("_", "").isalnum()
+                and os.access("plugins/client/" + str_plugin, os.F_OK)):
+                exec(open("plugins/client/" + str_plugin).read())
+                return
+            raise SystemExit("Invalid plugin load path in message: " + message)

 read_message_queue.parse_thingshere = False
 
 
 read_message_queue.parse_thingshere = False
 
 

diff --git a/server/commands.py b/server/commands.py
index 346661a5db11d342ad2133f3e68f110e8754b56b..a3b68bcc62dfc810e22035e06d3b3a5eb0fe8771 100644 (file)
--- a/server/commands.py
+++ b/server/commands.py
@@ -15,8 +15,8 @@ def command_plugin(str_plugin):
     """Run code in plugins/[str_plugin]."""
     import os
     if (str_plugin.replace("_", "").isalnum()
     """Run code in plugins/[str_plugin]."""
     import os
     if (str_plugin.replace("_", "").isalnum()

-        and os.access("plugins/" + str_plugin, os.F_OK)):
-        exec(open("plugins/" + str_plugin).read())
+        and os.access("plugins/server/" + str_plugin, os.F_OK)):
+        exec(open("plugins/server/" + str_plugin).read())

         return
     print("Bad plugin name:", str_plugin)
 
         return
     print("Bad plugin name:", str_plugin)