Changeset 1278 for 1.8.3/trunk/src/extchat.c

Timestamp:

09/23/08 12:50:40 (2 months ago)

Author:

shawnw

Message:

Prep for 1.8.3p7

Files:

• 1.8.3/trunk/src/extchat.c (modified) (7 diffs)

1.8.3/trunk/src/extchat.c

@@ -103 +103 @@
-CHAN *channels;    /**< Pointer to channel list */
-
+extern int rhs_present;         /* from command.c */
+
-static PRIV priv_table[] = {
-  {"Disabled", 'D', CHANNEL_DISABLED, CHANNEL_DISABLED},
@@ -196 +198 @@
-init_chatdb(void)
-{
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -518 +524 @@
-      db_read_this_labeled_int(fp, "type", &n);
-      db_read_this_labeled_string(fp, "title", &tmp);
+      ChanNumUsers(ch) -= 1;
-    }
-  }
@@ -2027 +2034 @@
-    return;
-  }
+
+  test_channel(player, name, c);
+  u = onchannel(player, c);
+  if (!u) {
+    notify_format(player, T("You are not on channel <%s>."), ChanName(c));
+    return;
+  }
+
+  if (!rhs_present) {
+    if (strlen(CUtitle(u)) == 0)
+      notify_format(player, T("You have no title set on <%s>."), ChanName(c));
+    else
+      notify_format(player, T("Your title on <%s> is '%s'."), ChanName(c),
+                    CUtitle(u));
+    return;
+  }
+
-  if (!title)
-    title = (const char *) "";
@@ -2042 +2066 @@
-    }
-  }
-
-
-
-
-
-
+
-  strcpy(CUtitle(u), title);
-  if (!Quiet(player))
@@ -2254 +2273 @@
-}
-
+/* ARGSUSED */
+FUNCTION(fun_cbufferadd)
+{
+  CHAN *c;
+  dbref victim;
+
+  // Person must be able to do nospoof cemits.
+  if (!command_check_byname(executor, "@cemit") || fun->flags & FN_NOSIDEFX) {
+    safe_str(T(e_perm), buff, bp);
+    return;
+  }
+  // Find the channel.
+  if (!args[0] || !*args[0]) {
+    safe_str(T("#-1 NO CHANNEL GIVEN"), buff, bp);
+    return;
+  }
+  // Make sure we have text.
+  if (!args[1] || !*args[1]) {
+    safe_str(T("#-1 NO TEXT GIVEN"), buff, bp);
+    return;
+  }
+
+  victim = executor;
+  // Do we spoof somebody else?
+  if (nargs == 3 && parse_boolean(args[2])) {
+    // Person must be able to do nospoof cemits.
+    if (!command_check_byname(executor, "@nscemit") || fun->flags & FN_NOSIDEFX) {
+      safe_str(T(e_perm), buff, bp);
+      return;
+    }
+    victim = enactor;
+  }
+  // Get the message.
+  switch (find_channel(args[0], &c, executor)) {
+  case CMATCH_NONE:
+    safe_str(T("#-1 NO SUCH CHANNEL"), buff, bp);
+    return;
+  case CMATCH_AMBIG:
+    safe_str(T("#-1 AMBIGUOUS CHANNEL NAME"), buff, bp);
+    return;
+  default:
+    if (!Chan_Can_Modify(c, executor)) {
+      safe_str(T(e_perm), buff, bp);
+    } else if (ChanBufferQ(c) != NULL) {
+      add_to_bufferq(ChanBufferQ(c), 0, victim, args[1]);
+    } else {
+      safe_str(T("#-1 CHANNEL DOES NOT HAVE A BUFFER"), buff, bp);
+    }
+  }
+}
+
-
-/* ARGSUSED */
@@ -3457 +3527 @@
-  }
-  u = onchannel(player, chan);
-
-
+
+
+
-    return;
-  }