Changeset 1202

Timestamp:

01/19/08 23:11:34 (9 months ago)

Author:

shawnw

Message:

#7479: @hook/override enhancment.

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (1 diff)
• 1.8.3/branches/devel/src/command.c (modified) (6 diffs)

1.8.3/branches/devel/CHANGES.183

@@ -26 +26 @@
-   are changed and automatically reload them instead of waiting for a 
-   @readcache.
+ * '@hook/override cmd=#1234' will look at all attributes on the object
+   for a matching $command. By Talvo.
-
-Functions:

1.8.3/branches/devel/src/command.c

@@ -68 +68 @@
-int run_hook(dbref player, dbref cause, struct hook_data *hook,
-             char *saveregs[], int save);
+
+int run_hook_override(COMMAND_INFO *cmd, dbref player, const char *commandraw);
+
-
-/** The list of standard commands. Additional commands can be added
@@ -1343 +1346 @@
-    if (run_hook(player, cause, &cmd->hooks.ignore, saveregs, 1)) {
-      /* If we have a hook/override, we use that instead */
-
-
-
+
-        /* Otherwise, we do hook/before, the command, and hook/after */
-        /* But first, let's see if we had an invalid switch */
@@ -1948 +1949 @@
-has_hook(struct hook_data *hook)
-{
-
-
+
-    return 0;
-  return 1;
@@ -2004 +2004 @@
-  mush_free(code, "hook.code");
-  return parse_boolean(buff);
+}
+
+int
+run_hook_override(COMMAND_INFO *cmd, dbref player, const char *commandraw)
+{
+
+  if (!has_hook(&cmd->hooks.override))
+    return 0;
+
+  if (cmd->hooks.override.attrname) {
+    return one_comm_match(cmd->hooks.override.obj, player,
+                          cmd->hooks.override.attrname, commandraw);
+  } else {
+    return atr_comm_match(cmd->hooks.override.obj, player, '$', ':', commandraw,
+                          0, NULL, NULL, NULL);
+  }
-}
-
@@ -2052 +2068 @@
-    mush_free(h->attrname, "hook.attr");
-    h->attrname = NULL;
-
-
+
+
+
+
+
+
+
-  } else {
-    dbref objdb = match_thing(player, obj);
@@ -2063 +2084 @@
-    if (h->attrname)
-      mush_free(h->attrname, "hook.attr");
-
+
+
+
+
+
-    notify_format(player, T("Hook set for %s"), cmd->name);
-  }