Changeset 1307

Timestamp:

10/03/08 16:32:24 (2 months ago)

Author:

shawnw

Message:

#7583: @set of an already set flag.

Files:

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

1.8.3/branches/devel/CHANGES.183

@@ -24 +24 @@
-   existing databases and log files that it makes. Suggested
-   by Ray,
+ * @setting a flag that's already set will say so. Suggested by
+   Kimiko, patch by Talvo.
-
-Version 1.8.3 patchlevel 7                      Oct 01, 2008

1.8.3/branches/devel/src/flags.c

@@ -1545 +1545 @@
-  char *tp;
-  FLAGSPACE *n;
+  int current;
-
-  n = (FLAGSPACE *) hashfind("FLAG", &htab_flagspaces);
@@ -1562 +1563 @@
-  }
-
+  current = sees_flag("FLAG", player, thing, f->name);
+  
-  twiddle_flag(n, thing, f, negate);
-  if (negate) {
@@ -1617 +1620 @@
-      safe_str(" - ", tbuf1, &tp);
-      safe_str(f->name, tbuf1, &tp);
+      if (!current)
+        safe_str(" (already)", tbuf1, &tp);
-      safe_str(T(" reset."), tbuf1, &tp);
-      *tp = '\0';
@@ -1679 +1684 @@
-      safe_str(" - ", tbuf1, &tp);
-      safe_str(f->name, tbuf1, &tp);
+      if (current)
+        safe_str(" (already)", tbuf1, &tp);
-      safe_str(T(" set."), tbuf1, &tp);
-      *tp = '\0';