diff options
| author | jack <jack@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-03 05:58:08 +0800 |
|---|---|---|
| committer | jack <jack@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-03 05:58:08 +0800 |
| commit | e443776eb7025c569df22f801965f0ec84798e35 (patch) | |
| tree | a6200d5ccc57109dfece0b30180da83a9915785c /mbbsd/announce.c | |
| parent | 886fd091d3cc9e39e342e13e994fb63acb30c34b (diff) | |
| download | pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.gz pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.bz2 pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.lz pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.xz pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.zst pttbbs-e443776eb7025c569df22f801965f0ec84798e35.zip | |
merge trunk to branches and corrected confliction
git-svn-id: http://opensvn.csie.org/pttbbs/branches/Jaky.i18n@1919 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd/announce.c')
| -rw-r--r-- | mbbsd/announce.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/mbbsd/announce.c b/mbbsd/announce.c index d60e35ed..e09f0448 100644 --- a/mbbsd/announce.c +++ b/mbbsd/announce.c @@ -298,9 +298,8 @@ a_pasteitem(menu_t * pm, int mode) if (dashd(copyfile)) { for (i = 0; copyfile[i] && copyfile[i] == pm->path[i]; i++); if (!copyfile[i]) { - outs(SHM->i18nstr[cuser.language][197]); - igetch(); - return; + vmsg(SHM->i18nstr[cuser.language][197]); + return; } } if (mode) { @@ -664,9 +663,7 @@ a_showname(menu_t * pm) sym = 1; } if (sym) { - pressanykey(); - move(b_lines - 1, 1); - prints(SHM->i18nstr[cuser.language][219], &buf[i + 1]); + vmsg(SHM->i18nstr[cuser.language][219], &buf[i + 1]); } } } @@ -894,21 +891,19 @@ a_menu(char *maintitle, char *path, int lastlevel) Fexit = 1; if (currstat == OSONG) { /* XXX: 只選歌未點歌可灌排行榜 */ - char buf[128]; - snprintf(buf, sizeof(buf), - "%s\n", fhdr->title); - log_file(FN_USSONG, buf, 1); + log_file(FN_USSONG, 1, + "%s\n", fhdr->title); } free(me.header); return FULLUPDATE; } } - if (more_result == 1) { + if (more_result == READ_PREV) { if (--me.now < 0) { me.now = 0; break; } - } else if (more_result == 3) { + } else if (more_result == READ_NEXT) { if (++me.now >= me.num) { me.now = me.num - 1; break; |