diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2013-02-01 15:13:56 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2013-02-01 15:13:56 +0800 |
| commit | 8bfb646587d13025441d455b84e39c59d70276fa (patch) | |
| tree | eba6f7b2df975e416523077e414252c0b57d1a3f | |
| parent | bf0afeb10a06989c9bf472a0054655e0ed0f8f88 (diff) | |
| download | pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.tar pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.tar.gz pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.tar.bz2 pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.tar.lz pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.tar.xz pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.tar.zst pttbbs-8bfb646587d13025441d455b84e39c59d70276fa.zip | |
Fix angel stuff
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5785 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/mbbsd/angel.c | 1 | ||||
| -rw-r--r-- | pttbbs/mbbsd/ordersong.c | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pttbbs/mbbsd/angel.c b/pttbbs/mbbsd/angel.c index a2705d51..8180d9d8 100644 --- a/pttbbs/mbbsd/angel.c +++ b/pttbbs/mbbsd/angel.c @@ -840,6 +840,7 @@ TalkToAngel(){ if (dashs(msg_fn) > 0) { // render per-user message move(1, 0); + clrtobot(); angel_display_message(FN_ANGEL_USAGE2, msg_fn, 0, 2, 4, 6, 24); } else { more(FN_ANGEL_USAGE, NA); diff --git a/pttbbs/mbbsd/ordersong.c b/pttbbs/mbbsd/ordersong.c index 964b3408..91f7dcb6 100644 --- a/pttbbs/mbbsd/ordersong.c +++ b/pttbbs/mbbsd/ordersong.c @@ -182,8 +182,15 @@ do_order_song(void) strlcpy(buf, genbuf, sizeof(buf)); } while ((po = strstr(buf, "<~Des~>"))) { + const char *r = receiver; +#ifdef PLAY_ANGEL + if (strstr(po, "小天使") && strstr(receiver, "小天使") && + override_receiver) { + r = override_receiver; + } +#endif po[0] = 0; - snprintf(genbuf, sizeof(genbuf), "%s%s%s", buf, receiver, po + 7); + snprintf(genbuf, sizeof(genbuf), "%s%s%s", buf, r, po + 7); strlcpy(buf, genbuf, sizeof(buf)); } while ((po = strstr(buf, "<~Say~>"))) { |