Ticket #7583: flag-already-set.patch.txt

File flag-already-set.patch.txt, 1.2 kB (added by Talvo, 7 months ago)

Line
1	*** src/flags.c.orig Fri Oct 5 23:36:32 2007
2	--- src/flags.c Mon Apr 28 21:42:23 2008
3	***************
4	* 1543,1548 **
5	--- 1543,1549 ----
6	char tbuf1[BUFFER_LEN];
7	char *tp;
8	FLAGSPACE *n;
9	+ int current;
10
11	n = (FLAGSPACE *) hashfind("FLAG", &htab_flagspaces);
12	if ((f = flag_hash_lookup(n, flag, Typeof(thing))) == NULL) {
13	***************
14	* 1560,1565 **
15	--- 1561,1568 ----
16	return;
17	}
18
19	+ current = sees_flag("FLAG", player, thing, f->name);
20	+
21	twiddle_flag(n, thing, f, negate);
22	if (negate) {
23	/* log if necessary */
24	***************
25	* 1615,1620 **
26	--- 1618,1625 ----
27	safe_str(Name(thing), tbuf1, &tp);
28	safe_str(" - ", tbuf1, &tp);
29	safe_str(f->name, tbuf1, &tp);
30	+ if (!current)
31	+ safe_str(" (already)", tbuf1, &tp);
32	safe_str(T(" reset."), tbuf1, &tp);
33	*tp = '\0';
34	notify(player, tbuf1);
35	***************
36	* 1677,1682 **
37	--- 1682,1689 ----
38	safe_str(Name(thing), tbuf1, &tp);
39	safe_str(" - ", tbuf1, &tp);
40	safe_str(f->name, tbuf1, &tp);
41	+ if (current)
42	+ safe_str(" (already)", tbuf1, &tp);
43	safe_str(T(" set."), tbuf1, &tp);
44	*tp = '\0';
45	notify(player, tbuf1);