Fix pending anno count for annos squashed together
authorMarkus Armbruster <armbru@pond.sub.org>
Mon, 21 Nov 2011 06:20:01 +0000 (07:20 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Thu, 29 Dec 2011 10:47:07 +0000 (11:47 +0100)
Adjacent announcements are squashed together when the sender is the
same and the timestamp is "close enough".  Except typed_wu()
increments natstr member nat_ann regardless.  Fix that to work exactly
like nat_tgms.

src/lib/subs/wu.c

index 5cd6ea23ced4e2dcd651b84b60099c3c4470b0f9..84549a0df459b7e416b209fb6d4f6dc1f86481b5 100644 (file)
@@ -167,8 +167,10 @@ typed_wu(natid from, natid to, char *message, int type)
                continue;
            if (!player->god && (getrejects(from, np) & REJ_ANNO))
                continue;
-           np->nat_ann++;
-           putnat(np);
+           if (!np->nat_ann || !tel.tel_cont) {
+               np->nat_ann++;
+               putnat(np);
+           }
        }
     } else {
        if (!np->nat_tgms || !tel.tel_cont) {