diff options
| -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~>"))) { |